Index: wine/include/animate.h
===================================================================
RCS file: /home/wine/wine/include/animate.h,v
retrieving revision 1.5
diff -u -u -r1.5 animate.h
--- wine/include/animate.h	1999/10/23 14:01:32	1.5
+++ wine/include/animate.h	2000/03/23 13:58:06
@@ -8,6 +8,7 @@
 #define __WINE_ANIMATE_H
 
 #include "windef.h"
+#include "winbase.h"
 #include "vfw.h"
 
 typedef struct tagANIMATE_INFO
Index: wine/include/button.h
===================================================================
RCS file: /home/wine/wine/include/button.h,v
retrieving revision 1.5
diff -u -u -r1.5 button.h
--- wine/include/button.h	1999/09/27 11:38:48	1.5
+++ wine/include/button.h	2000/03/23 13:58:06
@@ -7,6 +7,7 @@
 #ifndef __WINE_BUTTON_H
 #define __WINE_BUTTON_H
 
+#include "windef.h"
 #include "wingdi.h"
 
   /* Extra info for BUTTON windows */
Index: wine/include/dispdib.h
===================================================================
RCS file: /home/wine/wine/include/dispdib.h,v
retrieving revision 1.3
diff -u -u -r1.3 dispdib.h
--- wine/include/dispdib.h	1999/02/21 18:23:27	1.3
+++ wine/include/dispdib.h	2000/03/23 13:58:06
@@ -8,6 +8,7 @@
 #ifndef __WINE_DISPDIB_H
 #define __WINE_DISPDIB_H
 
+#include "windef.h"
 #include "wingdi.h" /* for LPBITMAPINFO */
 
 /* error codes */
Index: wine/include/enhmetafile.h
===================================================================
RCS file: /home/wine/wine/include/enhmetafile.h,v
retrieving revision 1.1
diff -u -u -r1.1 enhmetafile.h
--- wine/include/enhmetafile.h	1999/05/02 09:23:51	1.1
+++ wine/include/enhmetafile.h	2000/03/23 13:58:06
@@ -6,8 +6,9 @@
 #ifndef __WINE_ENHMETAFILE_H
 #define __WINE_ENHMETAFILE_H
 
-#include "wingdi.h"
 #include "gdi.h"
+#include "windef.h"
+#include "wingdi.h"
 
   /* GDI32 enhanced metafile object */
 typedef struct
Index: wine/include/imagelist.h
===================================================================
RCS file: /home/wine/wine/include/imagelist.h,v
retrieving revision 1.8
diff -u -u -r1.8 imagelist.h
--- wine/include/imagelist.h	2000/01/30 22:21:22	1.8
+++ wine/include/imagelist.h	2000/03/23 13:58:06
@@ -7,7 +7,7 @@
 #ifndef __WINE_IMAGELIST_H
 #define __WINE_IMAGELIST_H
 
-
+#include "windef.h"
 #include "wingdi.h"
 
 #include "pshpack1.h"
Index: wine/include/imm.h
===================================================================
RCS file: /home/wine/wine/include/imm.h,v
retrieving revision 1.6
diff -u -u -r1.6 imm.h
--- wine/include/imm.h	1999/04/22 16:27:52	1.6
+++ wine/include/imm.h	2000/03/23 13:58:06
@@ -6,6 +6,8 @@
 #define __WINE_IMM_H
 
 #include "windef.h"
+#include "wingdi.h"
+#include "winuser.h"
 
 #ifdef __cplusplus
 extern "C" {
Index: wine/include/lzexpand.h
===================================================================
RCS file: /home/wine/wine/include/lzexpand.h,v
retrieving revision 1.6
diff -u -u -r1.6 lzexpand.h
--- wine/include/lzexpand.h	1999/06/12 10:53:07	1.6
+++ wine/include/lzexpand.h	2000/03/23 13:58:06
@@ -8,6 +8,7 @@
 #define __WINE_LZEXPAND_H
 
 #include "windef.h"
+#include "winbase.h"
 
 #ifdef __cplusplus
 extern "C" {
Index: wine/include/metafile.h
===================================================================
RCS file: /home/wine/wine/include/metafile.h,v
retrieving revision 1.5
diff -u -u -r1.5 metafile.h
--- wine/include/metafile.h	1999/05/08 12:50:39	1.5
+++ wine/include/metafile.h	2000/03/23 13:58:06
@@ -7,8 +7,9 @@
 #ifndef __WINE_METAFILE_H
 #define __WINE_METAFILE_H
 
-#include "wingdi.h"
 #include "gdi.h"
+#include "windef.h"
+#include "wingdi.h"
 
   /* GDI32 metafile object */
 typedef struct
Index: wine/include/region.h
===================================================================
RCS file: /home/wine/wine/include/region.h,v
retrieving revision 1.5
diff -u -u -r1.5 region.h
--- wine/include/region.h	2000/02/16 22:47:27	1.5
+++ wine/include/region.h	2000/03/23 13:58:06
@@ -7,8 +7,9 @@
 #ifndef __WINE_REGION_H
 #define __WINE_REGION_H
 
-#include "wingdi.h"
 #include "gdi.h"
+#include "windef.h"
+#include "wingdi.h"
 
 typedef struct {
     INT size;
Index: wine/include/sqltypes.h
===================================================================
RCS file: /home/wine/wine/include/sqltypes.h,v
retrieving revision 1.1
diff -u -u -r1.1 sqltypes.h
--- wine/include/sqltypes.h	1999/12/11 23:56:46	1.1
+++ wine/include/sqltypes.h	2000/03/23 13:58:06
@@ -12,26 +12,6 @@
 extern "C" {
 #endif
 
-#ifndef _WINDOWS
-#define FAR
-#define CALLBACK
-#define SQL_API
-#define	BOOL				int
-typedef void*				HWND;
-typedef char*				GUID;
-#define GUID_DEFINED
-typedef char				CHAR;
-typedef void				VOID;
-typedef unsigned short		WORD;
-typedef unsigned long		DWORD;
-typedef unsigned char		BYTE;
-typedef unsigned short 		WCHAR;
-typedef WCHAR* 		        LPWSTR;
-typedef const char*         LPCSTR;
-typedef char*               LPSTR;
-typedef DWORD*           	LPDWORD;
-#endif
-
 typedef unsigned char   SQLCHAR;
 
 #if (ODBCVER >= 0x0300)
Index: wine/include/stackframe.h
===================================================================
RCS file: /home/wine/wine/include/stackframe.h,v
retrieving revision 1.12
diff -u -u -r1.12 stackframe.h
--- wine/include/stackframe.h	2000/03/08 18:26:57	1.12
+++ wine/include/stackframe.h	2000/03/23 13:58:06
@@ -96,7 +96,7 @@
 /* Push a DWORD on the 32-bit stack */
 static inline void WINE_UNUSED stack32_push( CONTEXT86 *context, DWORD val )
 {
-    ESP_reg(context) -= sizeof(DWORD);
+    *(DWORD *)ESP_reg(context) -= sizeof(DWORD);
     *(DWORD *)ESP_reg(context) = val;
 }
 
@@ -104,7 +104,7 @@
 static inline DWORD WINE_UNUSED stack32_pop( CONTEXT86 *context )
 {
     DWORD ret = *(DWORD *)ESP_reg(context);
-    ESP_reg(context) += sizeof(DWORD);
+    *(DWORD *)ESP_reg(context) += sizeof(DWORD);
     return ret;
 }
 
Index: wine/include/wine/icmpapi.h
===================================================================
RCS file: /home/wine/wine/include/wine/icmpapi.h,v
retrieving revision 1.1
diff -u -u -r1.1 icmpapi.h
--- wine/include/wine/icmpapi.h	1999/11/07 21:22:17	1.1
+++ wine/include/wine/icmpapi.h	2000/03/23 13:58:07
@@ -10,6 +10,9 @@
 #ifndef __WINE_ICMPAPI_H
 #define __WINE_ICMPAPI_H
 
+#include "wine/ipexport.h"
+#include "windef.h"
+
 HANDLE WINAPI IcmpCreateFile(
     VOID
     );
Index: wine/include/wine/obj_commdlgbrowser.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_commdlgbrowser.h,v
retrieving revision 1.4
diff -u -u -r1.4 obj_commdlgbrowser.h
--- wine/include/wine/obj_commdlgbrowser.h	1999/10/23 20:09:06	1.4
+++ wine/include/wine/obj_commdlgbrowser.h	2000/03/23 13:58:07
@@ -6,6 +6,7 @@
 #define __WINE_WINE_OBJ_COMMDLGBROWSER_H
 
 #include "winbase.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/obj_base.h"
 #include "wine/obj_shellview.h"
Index: wine/include/wine/obj_contextmenu.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_contextmenu.h,v
retrieving revision 1.6
diff -u -u -r1.6 obj_contextmenu.h
--- wine/include/wine/obj_contextmenu.h	2000/02/26 18:36:56	1.6
+++ wine/include/wine/obj_contextmenu.h	2000/03/23 13:58:07
@@ -10,6 +10,7 @@
 #define __WINE_WINE_OBJ_CONTEXTMENU_H
 
 #include "winbase.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/obj_base.h"
 
Index: wine/include/wine/obj_dockingwindowframe.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_dockingwindowframe.h,v
retrieving revision 1.4
diff -u -u -r1.4 obj_dockingwindowframe.h
--- wine/include/wine/obj_dockingwindowframe.h	1999/10/23 20:09:06	1.4
+++ wine/include/wine/obj_dockingwindowframe.h	2000/03/23 13:58:07
@@ -6,6 +6,7 @@
 #define __WINE_WINE_OBJ_DOCKINGWINDOWFRAME_H
 
 #include "winbase.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/obj_base.h"
 #include "wine/obj_inplace.h"
Index: wine/include/wine/obj_property.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_property.h,v
retrieving revision 1.5
diff -u -u -r1.5 obj_property.h
--- wine/include/wine/obj_property.h	1999/10/24 21:48:50	1.5
+++ wine/include/wine/obj_property.h	2000/03/23 13:58:07
@@ -10,6 +10,7 @@
 #include "wine/obj_oleaut.h" /* for DISPID */
 #include "wine/obj_storage.h"
 #include "winbase.h"
+#include "wingdi.h"
 #include "winuser.h"
 
 #ifdef __cplusplus
Index: wine/include/wine/obj_shellextinit.h
===================================================================
RCS file: /home/wine/wine/include/wine/obj_shellextinit.h,v
retrieving revision 1.5
diff -u -u -r1.5 obj_shellextinit.h
--- wine/include/wine/obj_shellextinit.h	1999/10/24 21:48:50	1.5
+++ wine/include/wine/obj_shellextinit.h	2000/03/23 13:58:07
@@ -7,6 +7,7 @@
 
 #include "shell.h"
 #include "winbase.h"
+#include "wingdi.h"
 #include "winuser.h"
 #include "wine/obj_base.h"
 #include "wine/obj_dataobject.h"
Index: wine/include/wine/windef16.h
===================================================================
RCS file: /home/wine/wine/include/wine/windef16.h,v
retrieving revision 1.2
diff -u -u -r1.2 windef16.h
--- wine/include/wine/windef16.h	2000/02/26 13:17:58	1.2
+++ wine/include/wine/windef16.h	2000/03/23 13:58:07
@@ -7,6 +7,8 @@
 #ifndef __WINE_WINDEF16_H
 #define __WINE_WINDEF16_H
 
+#include "windef.h"
+
 /* Standard data types */
 
 typedef short           INT16;
Index: wine/include/wine/wingdi16.h
===================================================================
RCS file: /home/wine/wine/include/wine/wingdi16.h,v
retrieving revision 1.8
diff -u -u -r1.8 wingdi16.h
--- wine/include/wine/wingdi16.h	1999/11/21 02:01:42	1.8
+++ wine/include/wine/wingdi16.h	2000/03/23 13:58:07
@@ -1,6 +1,7 @@
 #ifndef __WINE_WINE_WINGDI16_H
 #define __WINE_WINE_WINGDI16_H
 
+#include "windef.h"
 #include "wingdi.h"
 
 #include "pshpack1.h"
Index: wine/include/winpos.h
===================================================================
RCS file: /home/wine/wine/include/winpos.h,v
retrieving revision 1.8
diff -u -u -r1.8 winpos.h
--- wine/include/winpos.h	2000/03/08 18:26:57	1.8
+++ wine/include/winpos.h	2000/03/23 13:58:07
@@ -8,6 +8,8 @@
 #define __WINE_WINPOS_H
 
 #include "windef.h"
+#include "wingdi.h"
+#include "winuser.h"
 
 struct tagWND;