Removed #include of wingdi.h and windef.h from winuser.h (and resolved
the resulting compilation failures).
diff --git a/misc/comm.c b/misc/comm.c
index 4cee534..5e56964 100644
--- a/misc/comm.c
+++ b/misc/comm.c
@@ -35,6 +35,7 @@
#include "config.h"
#include <stdlib.h>
+#include <stdio.h>
#include <termios.h>
#include <fcntl.h>
#include <string.h>
@@ -50,6 +51,8 @@
#include <sys/ioctl.h>
#include <unistd.h>
+#include "windef.h"
+#include "wingdi.h"
#include "wine/winuser16.h"
#include "comm.h"
#ifdef HAVE_SYS_MODEM_H
@@ -69,7 +72,7 @@
#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(comm)
+DEFAULT_DEBUG_CHANNEL(comm);
#ifndef TIOCINQ
#define TIOCINQ FIONREAD
diff --git a/misc/ddeml.c b/misc/ddeml.c
index 7e635dc..41bd899 100644
--- a/misc/ddeml.c
+++ b/misc/ddeml.c
@@ -11,6 +11,8 @@
#include <stdlib.h>
#include <string.h>
#include "winbase.h"
+#include "windef.h"
+#include "wingdi.h"
#include "winuser.h"
#include "ddeml.h"
#include "winerror.h"
diff --git a/misc/lstr.c b/misc/lstr.c
index 1637fc4..389b1f1 100644
--- a/misc/lstr.c
+++ b/misc/lstr.c
@@ -9,6 +9,7 @@
#include <stdarg.h>
#include <stdlib.h>
+#include <stdio.h>
#include <string.h>
#include <ctype.h>
@@ -21,10 +22,12 @@
# define iswlower(c) islower(c)
#endif /* HAVE_WCTYPE_H */
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
-#include "winbase.h"
-#include "winuser.h"
#include "winnls.h"
#include "task.h"
#include "heap.h"
@@ -33,7 +36,7 @@
#include "module.h"
#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(resource)
+DEFAULT_DEBUG_CHANNEL(resource);
extern const WORD OLE2NLS_CT_CType3_LUT[]; /* FIXME: does not belong here */
diff --git a/misc/main.c b/misc/main.c
index a0254a7..22645cb 100644
--- a/misc/main.c
+++ b/misc/main.c
@@ -41,6 +41,8 @@
#include "keyboard.h"
#include "gdi.h"
#include "user.h"
+#include "windef.h"
+#include "wingdi.h"
#include "wine/winuser16.h"
#include "tweak.h"
diff --git a/misc/spy.c b/misc/spy.c
index 0033ece..6caaf7e 100644
--- a/misc/spy.c
+++ b/misc/spy.c
@@ -7,6 +7,9 @@
#include <stdlib.h>
#include <string.h>
+#include <stdio.h>
+#include "windef.h"
+#include "wingdi.h"
#include "wine/winuser16.h"
#include "wine/winbase16.h"
#include "win.h"
diff --git a/misc/system.c b/misc/system.c
index 9302671..dbb71a0 100644
--- a/misc/system.c
+++ b/misc/system.c
@@ -4,6 +4,8 @@
* Copyright 1996 Alexandre Julliard
*/
+#include "windef.h"
+#include "wingdi.h"
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "services.h"
diff --git a/misc/tweak.c b/misc/tweak.c
index 4c30596..f6f299a 100644
--- a/misc/tweak.c
+++ b/misc/tweak.c
@@ -29,6 +29,8 @@
*****************************************************************************/
#include <string.h>
+#include "windef.h"
+#include "wingdi.h"
#include "winuser.h"
#include "tweak.h"
#include "options.h"
diff --git a/misc/version.c b/misc/version.c
index 993f8f7..1d9d80e 100644
--- a/misc/version.c
+++ b/misc/version.c
@@ -9,7 +9,10 @@
#include <string.h>
#include <stdlib.h>
+#include <stdio.h>
+#include "windef.h"
#include "winbase.h"
+#include "wingdi.h"
#include "winuser.h"
#include "wine/winbase16.h"
#include "process.h"
diff --git a/misc/wsprintf.c b/misc/wsprintf.c
index 9c48305..07fbae8 100644
--- a/misc/wsprintf.c
+++ b/misc/wsprintf.c
@@ -6,7 +6,10 @@
#include <stdarg.h>
#include <string.h>
+#include <stdio.h>
#include "wine/winbase16.h"
+#include "windef.h"
+#include "wingdi.h"
#include "winuser.h"
#include "ldt.h"
#include "stackframe.h"
