Renamed wintypes.h to windef.h.

console/tty.c

@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include "console.h"
 #include "config.h"
-#include "wintypes.h" /* FALSE */
+#include "windef.h"
 void TTY_Start()
 {
    /* This should be the root driver so we can ignore anything

debugger/editline.c

@@ -33,7 +33,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "wintypes.h"
+#include "windef.h"
 
 /*
 **  Manifest constants.

dlls/advapi32/advapi.c

@@ -7,7 +7,7 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "wintypes.h"
+#include "windef.h"
 #include "winerror.h"
 #include "wine/winestring.h"
 #include "heap.h"

dlls/advapi32/crypt.c

 /*
  * dlls/advapi32/crypt.c
  */
-#include "wintypes.h"
+#include "windef.h"
 #include "winerror.h"
 #include "wincrypt.h"
 #include "debug.h"

dlls/advapi32/eventlog.c

@@ -4,7 +4,7 @@
  * Copyright 1995 Sven Verdoolaege, 1998 Juergen Schmied
  */
 
-#include "wintypes.h"
+#include "windef.h"
 #include "winreg.h"
 #include "winerror.h"
 #include "heap.h"

dlls/advapi32/security.c

@@ -4,7 +4,7 @@
  */
 #include <string.h>
 
-#include "wintypes.h"
+#include "windef.h"
 #include "winreg.h"
 #include "winerror.h"
 #include "heap.h"

dlls/advapi32/service.c

@@ -5,7 +5,7 @@
  */
 
 #include <time.h>
-#include "wintypes.h"
+#include "windef.h"
 #include "winreg.h"
 #include "winerror.h"
 #include "heap.h"

dlls/imagehlp/access.c

@@ -7,7 +7,7 @@
 #include "winbase.h"
 #include "winnt.h"
 #include "winerror.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "heap.h"
 #include "debug.h"
 #include "imagehlp.h"

dlls/imagehlp/debug.c

@@ -6,7 +6,7 @@
 
 #include "winerror.h"
 #include "winbase.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "debug.h"
 #include "imagehlp.h"
 

dlls/imagehlp/imagehlp_main.c

@@ -7,7 +7,7 @@
 #include "imagehlp.h"
 #include "winerror.h"
 #include "winbase.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "debug.h"
 
 /**********************************************************************/

dlls/imagehlp/integrity.c

@@ -4,7 +4,7 @@
  *	Copyright 1998	Patrik Stridvall
  */
 
-#include "wintypes.h"
+#include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "imagehlp.h"

dlls/imagehlp/internal.c

@@ -6,7 +6,7 @@
 
 #include "winbase.h"
 #include "winerror.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "debug.h"
 #include "imagehlp.h"
 

dlls/imagehlp/modify.c

@@ -6,7 +6,7 @@
 
 #include "winbase.h"
 #include "winerror.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "debug.h"
 #include "imagehlp.h"
 

dlls/imagehlp/symbol.c

@@ -6,7 +6,7 @@
 
 #include "winbase.h"
 #include "winerror.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "debug.h"
 #include "imagehlp.h"
 

dlls/msacm32/builtin.c

@@ -6,7 +6,7 @@
 
 #include "winbase.h"
 #include "winerror.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "debug.h"
 #include "driver.h"
 #include "heap.h"

dlls/msacm32/driver.c

@@ -6,7 +6,7 @@
 
 #include "winbase.h"
 #include "winerror.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "winuser.h"
 #include "debug.h"
 #include "driver.h"

dlls/msacm32/format.c

@@ -6,7 +6,7 @@
 
 #include "winbase.h"
 #include "winerror.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "debug.h"
 #include "mmsystem.h"
 #include "msacm.h"

dlls/msacm32/msacm32_main.c

@@ -6,7 +6,7 @@
 
 #include "winbase.h"
 #include "winerror.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "debug.h"
 #include "msacm.h"
 #include "msacmdrv.h"

dlls/msacm32/stream.c

@@ -6,7 +6,7 @@
 
 #include "winbase.h"
 #include "winerror.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "debug.h"
 #include "mmsystem.h"
 #include "msacm.h"

dlls/psapi/psapi_main.c

@@ -5,7 +5,7 @@
  */
 
 #include "winbase.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "winerror.h"
 #include "debug.h"
 #include "psapi.h"

dlls/rasapi32/rasapi.c

@@ -4,7 +4,7 @@
  * Copyright 1998 Marcus Meissner
  */
 
-#include "wintypes.h"
+#include "windef.h"
 #include "ras.h"
 #include "debug.h"
 

dlls/tapi32/assisted.c

@@ -5,7 +5,7 @@
  */
 
 #include "winbase.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "tapi.h"
 #include "debug.h"
 

dlls/tapi32/line.c

@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include "winbase.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "tapi.h"
 #include "debug.h"
 

dlls/tapi32/phone.c

@@ -5,7 +5,7 @@
  */
 
 #include "winbase.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "tapi.h"
 #include "debug.h"
 

files/async.c

@@ -35,7 +35,7 @@
 #endif
 
 #include "xmalloc.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "miscemu.h"
 #include "selectors.h"
 #include "sig_context.h"

graphics/d3dcommon.c

@@ -4,7 +4,7 @@
    This file contains all common miscellaneous code that spans
    different 'objects' */
 
-#include "wintypes.h"
+#include "windef.h"
 #include "wine/obj_base.h"
 #include "ddraw.h"
 #include "d3d.h"

graphics/d3ddevices.c

@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include "config.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
 #include "heap.h"

graphics/d3dexecutebuffer.c

@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include "config.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
 #include "heap.h"

graphics/d3dlight.c

@@ -5,7 +5,7 @@
 
 
 #include "config.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
 #include "heap.h"

graphics/d3dmaterial.c

@@ -4,7 +4,7 @@
    This files contains the implementation of Direct3DMaterial2. */
 
 #include "config.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
 #include "heap.h"

graphics/d3dtexture.c

@@ -6,7 +6,7 @@
 
 #include <string.h>
 #include "config.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
 #include "heap.h"

graphics/d3dviewport.c

@@ -4,7 +4,7 @@
    This files contains the implementation of Direct3DViewport2. */
 
 #include "config.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
 #include "heap.h"

graphics/ddraw.c

@@ -4253,7 +4253,7 @@ HRESULT WINAPI DirectDrawCreate( LPGUID lpGUID, LPDIRECTDRAW *lplpDD, LPUNKNOWN
 
 #else /* !defined(X_DISPLAY_MISSING) */
 
-#include "wintypes.h"
+#include "windef.h"
 
 #define DD_OK 0
 

graphics/wing.c

@@ -25,7 +25,7 @@
 #include "heap.h"
 #include "selectors.h"
 #include "monitor.h"
-#include "wintypes.h"
+#include "windef.h"
 #include "xmalloc.h"
 
 typedef enum WING_DITHER_TYPE

graphics/x11drv/dib.c

@@ -11,7 +11,7 @@
 #include "ts_xlib.h"
 #include "ts_xutil.h"
 
-#include "wintypes.h"
+#include "windef.h"
 #include "bitmap.h"
 #include "x11drv.h"
 #include "debug.h"

graphics/x11drv/text.c

@@ -12,7 +12,7 @@
 #include "ts_xlib.h"
 
 #include <stdlib.h>
-#include "wintypes.h"
+#include "windef.h"
 #include <math.h>
 #include "dc.h"
 #include "gdi.h"

if1632/dummy.c

@@ -2,7 +2,7 @@
  * Dummy function definitions
  */
 
-#include "wintypes.h"
+#include "windef.h"
 #include "debug.h"
 
 long WINAPI stub_GDI_379(HDC16 hdc) { FIXME(relay, "STARTPAGE: stub\n"); return 1; }

include/cache.h

@@ -9,7 +9,7 @@
 #ifndef __WINE_CACHE_H
 #define __WINE_CACHE_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 HBRUSH  CACHE_GetPattern55AABrush(void);
 HBITMAP CACHE_GetPattern55AABitmap(void);

include/callback.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_CALLBACK_H
 #define __WINE_CALLBACK_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "winnt.h"
 #include "wine/winuser16.h"
 

include/cdrom.h

@@ -11,7 +11,7 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#include "wintypes.h"
+#include "windef.h"
 
 #ifdef HAVE_LINUX_CDROM_H
 # include <linux/cdrom.h>

include/class.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_CLASS_H
 #define __WINE_CLASS_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "winproc.h"
 
 #define CLASS_MAGIC   ('C' | ('L' << 8) | ('A' << 16) | ('S' << 24))

include/clipboard.h

@@ -2,7 +2,7 @@
 #define __WINE_CLIPBOARD_H
 
 #include "win.h"
-#include "wintypes.h"
+#include "windef.h"
 
 typedef struct tagWINE_CLIPFORMAT {
     WORD	wFormatID;

include/commctrl.h

@@ -5,7 +5,7 @@
 #ifndef __WINE_COMMCTRL_H
 #define __WINE_COMMCTRL_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "winuser.h"
 #include "imagelist.h"
 

include/commdlg.h

@@ -9,7 +9,7 @@
 extern "C" {
 #endif
 
-#include "wintypes.h"		/* needed for CHOOSEFONT structure */
+#include "windef.h"		/* needed for CHOOSEFONT structure */
 #include "winuser.h"
 
 #define OFN_READONLY                 0x00000001

include/cursoricon.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_CURSORICON_H
 #define __WINE_CURSORICON_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #pragma pack(1)
 

include/dde.h

@@ -11,7 +11,7 @@
 #ifndef __WINE_DDE_H
 #define __WINE_DDE_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "dde_proc.h"
 
 #define WM_DDE_INITIATE   0x3E0

include/dde_atom.h

@@ -12,7 +12,7 @@
 
 #ifdef CONFIG_IPC
 
-#include "wintypes.h"
+#include "windef.h"
 
 #define DDE_ATOMS 157		   /* a prime number for hashing */
 

include/dde_mem.h

@@ -12,7 +12,7 @@
 
 #ifdef CONFIG_IPC
 
-#include "wintypes.h"
+#include "windef.h"
 #include "global.h"
 #include "shm_block.h"
 

include/dde_proc.h

@@ -13,7 +13,7 @@
 #ifdef CONFIG_IPC
 
 #include <setjmp.h>
-#include "wintypes.h"
+#include "windef.h"
 #include "windows.h"
 #define DDE_PROCS 64
 #define DDE_WINDOWS 64

include/ddeml.h

@@ -8,7 +8,7 @@
 #ifndef __WINE__DDEML_H
 #define __WINE__DDEML_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 /* Codepage Constants
  */

include/debugger.h

@@ -8,7 +8,7 @@
 #define __WINE_DEBUGGER_H
 
 #include <sys/types.h> /* u_long ... */
-#include "wintypes.h"
+#include "windef.h"
 #include "sig_context.h"
 #include "miscemu.h"
 

include/debugstr.h

 #ifndef __WINE_DEBUGSTR_H
 #define __WINE_DEBUGSTR_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 /* These function return a printable version of a string, including
    quotes.  The string will be valid for some time, but not indefinitely

include/desktop.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_DESKTOP_H
 #define __WINE_DESKTOP_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 struct tagMONITOR;
 

include/dinput.h

@@ -2,7 +2,6 @@
 #define _WINE_DINPUT_H
 
 #include "windef.h" /* for MAX_PATH */
-#include "wintypes.h"
 #include "unknwn.h"
 #include "mouse.h"
 

include/drive.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_DRIVE_H
 #define __WINE_DRIVE_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #define MAX_DOS_DRIVES  26
 

include/gdi.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_GDI_H
 #define __WINE_GDI_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "wingdi.h"
 #include "ldt.h"
 #include "local.h"

include/global.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_GLOBAL_H
 #define __WINE_GLOBAL_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 typedef struct
 {

include/hook.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_HOOK_H
 #define __WINE_HOOK_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #define HOOK_WIN16	0x00
 #define HOOK_WIN32A	0x01

include/imagehlp.h

@@ -5,7 +5,6 @@
 #ifndef __WINE_IMAGEHLP_H
 #define __WINE_IMAGEHLP_H
 
-#include "wintypes.h"
 #include "windef.h"
 #include "winbase.h"
 

include/imm.h

@@ -5,7 +5,7 @@
 #ifndef __WINE_IMM_H
 #define __WINE_IMM_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #ifdef __cplusplus
 extern "C" {

include/instance.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_INSTANCE_H
 #define __WINE_INSTANCE_H
 
-#include "wintypes.h"
+#include "windef.h"
 
   /* This structure is always located at offset 0 of the DGROUP segment */
 

include/keyboard.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_KEYBOARD_H
 #define __WINE_KEYBOARD_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #pragma pack(1)
 typedef struct _KBINFO

include/ldt.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_LDT_H
 #define __WINE_LDT_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 enum seg_type
 {

include/libres.h

@@ -4,7 +4,7 @@
 #ifndef __WINE_LIBRES_H
 #define __WINE_LIBRES_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 extern HRSRC LIBRES_FindResource( HINSTANCE hModule, LPCWSTR name, LPCWSTR type );
 extern HGLOBAL LIBRES_LoadResource( HINSTANCE hModule, HRSRC hRsrc );

include/local.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_LOCAL_H
 #define __WINE_LOCAL_H
 
-#include "wintypes.h"
+#include "windef.h"
 
   /* These function are equivalent to the Local* API functions, */
   /* excepted that they need DS as the first parameter. This    */

include/lzexpand.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_LZEXPAND_H
 #define __WINE_LZEXPAND_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #define LZERROR_BADINHANDLE	-1	/* -1 */
 #define LZERROR_BADOUTHANDLE	-2	/* -2 */

include/mapidefs.h

 #ifndef __WINE_MAPIDEFS_H
 #define __WINE_MAPIDEFS_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #ifndef _tagCY_DEFINED
 #define _tagCY_DEFINED

include/mdi.h

@@ -9,7 +9,7 @@
 #ifndef __WINE_MDI_H
 #define __WINE_MDI_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #define MDI_MAXLISTLENGTH	0x40
 #define MDI_MAXTITLELENGTH	0xA1

include/mmreg.h

@@ -10,7 +10,7 @@
 #ifndef _ACM_WAVEFILTER
 #define _ACM_WAVEFILTER
 
-#include "wintypes.h"
+#include "windef.h"
 
 #define WAVE_FILTER_UNKNOWN     0x0000
 #define WAVE_FILTER_DEVELOPMENT 0xFFFF

include/mmsystem.h

@@ -8,7 +8,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif 
-#include "wintypes.h"
+#include "windef.h"
 
 typedef LPSTR		    HPSTR;          /* a huge version of LPSTR */
 typedef LPCSTR			HPCSTR;         /* a huge version of LPCSTR */

include/module.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_MODULE_H
 #define __WINE_MODULE_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "dosexe.h"
 #include "pe_image.h"
 

include/msacm.h

@@ -5,7 +5,7 @@
 #ifndef __WINE_MSACM_H
 #define __WINE_MSACM_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "driver.h"
 #include "mmsystem.h"
 #include "mmreg.h"
@@ -14,7 +14,7 @@
  * Types
  */
 
-/* FIXME: Move to wintypes.h */
+/* FIXME: Move to windef.h */
 #define DECLARE_HANDLE(a) \
 typedef HANDLE16 a##16; \
 typedef HANDLE a; \
@@ -28,7 +28,7 @@ DECLARE_HANDLE(HACMDRIVER)
 DECLARE_HANDLE(HACMSTREAM)
 DECLARE_HANDLE(HACMOBJ)
 
-/* FIXME: Remove when define moved to wintypes.h */
+/* FIXME: Remove when define moved to windef.h */
 #undef DECLARE_HANDLE
 
 /***********************************************************************

include/msacmdrv.h

@@ -5,7 +5,7 @@
 #ifndef __WINE_MSACMDRV_H
 #define __WINE_MSACMDRV_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "msacm.h"
 
 /***********************************************************************

include/neexe.h

@@ -4,7 +4,7 @@
 #ifndef __WINE_NEEXE_H
 #define __WINE_NEEXE_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 /*
  * Old MZ header for DOS programs.

include/ntdef.h

@@ -2,7 +2,7 @@
 #define __WINE_NTDEF_H
 
 /* fixme: include basestd.h instead */
-#include "wintypes.h"
+#include "windef.h"
 
 #ifdef __cplusplus
 extern "C" {

include/ole2.h

@@ -5,7 +5,7 @@
 #ifndef __WINE_OLE2_H
 #define __WINE_OLE2_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "winerror.h"
 #include "oleidl.h"
 #include "oleauto.h"

include/olectl.h

 #ifndef __WINE_OLECTL_H
 #define __WINE_OLECTL_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #define WINOLECTLAPI INT WINAPI
 

include/options.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_OPTIONS_H
 #define __WINE_OPTIONS_H
 
-#include "wintypes.h"
+#include "windef.h"
 
   /* Supported languages */
   /* When adding a new language look at ole/ole2nls.c 

include/path.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_PATH_H
 #define __WINE_PATH_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 /* It should not be necessary to access the contents of the GdiPath
  * structure directly; if you find that the exported functions don't

include/pe_image.h

 #ifndef __WINE_PE_IMAGE_H
 #define __WINE_PE_IMAGE_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "winbase.h"
 #include "peexe.h"
 /* modreference used for attached processes

include/peexe.h

@@ -4,7 +4,7 @@
 #ifndef __WINE_PEEXE_H
 #define __WINE_PEEXE_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 typedef struct _IMAGE_FILE_HEADER {
 	WORD	Machine;			/* 00 */

include/process.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_PROCESS_H
 #define __WINE_PROCESS_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "module.h"
 
 struct _NE_MODULE;

include/progress.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_PROGRESS_H
 #define __WINE_PROGRESS_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 typedef struct
 {

include/queue.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_QUEUE_H
 #define __WINE_QUEUE_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "winuser.h"
 #include "thread.h"
 

include/ras.h

 #ifndef __WINE_RAS_H
 #define __WINE_RAS_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #define RAS_MaxEntryName	256
 

include/resource.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_RESOURCE_H
 #define __WINE_RESOURCE_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #ifndef __WRC_RSC_H
 #include "wrc_rsc.h"

include/scroll.h

@@ -8,7 +8,7 @@
 #ifndef __WINE_SCROLL_H
 #define __WINE_SCROLL_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 typedef struct
 {

include/selectors.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_SELECTORS_H
 #define __WINE_SELECTORS_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "ldt.h"
 
 extern WORD SELECTOR_AllocBlock( const void *base, DWORD size,

include/shell.h

@@ -4,7 +4,6 @@
 #ifndef __WINE_SHELL_H
 #define __WINE_SHELL_H
 
-#include "wintypes.h"
 #include "windef.h"
 
 

include/shellapi.h

 #ifndef _WINE_SHELLAPI_H
 #define _WINE_SHELLAPI_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 HICON16     WINAPI ExtractIcon16(HINSTANCE16,LPCSTR,UINT16);
 HICON     WINAPI ExtractIconA(HINSTANCE,LPCSTR,UINT);

include/shlobj.h

 #ifndef __WINE_SHLOBJ_H
 #define __WINE_SHLOBJ_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "winbase.h"	/* WIN32_FIND_* */
 #include "wine/obj_base.h"
 #include "wine/obj_shelllink.h"

include/shm_block.h

@@ -13,7 +13,7 @@
 #ifdef CONFIG_IPC
 
 #include <sys/shm.h>
-#include "wintypes.h"
+#include "windef.h"
 #define SEGSIZE                 0x10000 /* 64 */ 
 #define SHM_GRANULARITY         SEGSIZE
 #define SHM_MINBLOCK            SHM_GRANULARITY

include/spy.h

@@ -5,7 +5,7 @@
 #ifndef __WINE_SPY_H
 #define __WINE_SPY_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #define SPY_DISPATCHMESSAGE16     0x0100
 #define SPY_DISPATCHMESSAGE     0x0101

include/static.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_STATIC_H
 #define __WINE_STATIC_H
 
-#include "wintypes.h"
+#include "windef.h"
 
   /* Extra info for STATIC windows */
 typedef struct

include/stress.h

 #ifndef __WINE_STRESS_H
 #define __WINE_STRESS_H
 
-#include <wintypes.h>
+#include "windef.h"
 
 #ifdef __cplusplus
 extern "C" {

include/syslevel.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_SYSLEVEL_H
 #define __WINE_SYSLEVEL_H
 
-#include "wintypes.h"
+#include "windef.h"
 #include "winbase.h"
 
 extern WORD SYSLEVEL_Win16CurrentTeb;

include/sysmetrics.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_SYSMETRICS_H
 #define __WINE_SYSMETRICS_H
 
-#include "wintypes.h"
+#include "windef.h"
   /* Constant system metrics */
 #if 0
 #ifdef WIN_95_LOOK

include/task.h

@@ -7,7 +7,7 @@
 #ifndef __WINE_TASK_H
 #define __WINE_TASK_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #pragma pack(1)
 

include/tchar.h

 #ifndef __WINE_TCHAR_H
 #define __WINE_TCHAR_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #ifdef __cplusplus
 extern "C" {

include/tlhelp32.h

 #ifndef __WINE_TLHELP32_H
 #define __WINE_TLHELP32_H
 
-#include "wintypes.h"
+#include "windef.h"
 
 #ifdef __cplusplus
 extern "C" {