Moves more stuff from windows.h.
- include/winuser.h - interface relevant to user32.spec
- include/wine/winuser16.h - the old 16 bit interface (internal use)
- include/winbase.h - some minor updates to keep things coherent.
- Lot of other files made to include wine/winuser16.h, which is no
longer included from windows.h
diff --git a/windows/class.c b/windows/class.c
index 416e4ee..ddd8efe 100644
--- a/windows/class.c
+++ b/windows/class.c
@@ -23,6 +23,7 @@
#include "winproc.h"
#include "debug.h"
#include "winerror.h"
+#include "wine/winuser16.h"
static CLASS *firstClass = NULL;
diff --git a/windows/dce.c b/windows/dce.c
index 8b7b4cc..db0f19a 100644
--- a/windows/dce.c
+++ b/windows/dce.c
@@ -26,6 +26,7 @@
#include "heap.h"
#include "sysmetrics.h"
#include "debug.h"
+#include "wine/winuser16.h"
#define NB_DCE 5 /* Number of DCEs created at startup */
diff --git a/windows/defdlg.c b/windows/defdlg.c
index 5a7412d..dc273aa 100644
--- a/windows/defdlg.c
+++ b/windows/defdlg.c
@@ -5,7 +5,7 @@
*
*/
-#include "windows.h"
+#include "wine/winuser16.h"
#include "dialog.h"
#include "win.h"
#include "winproc.h"
diff --git a/windows/defwnd.c b/windows/defwnd.c
index 879ff50..165b54c 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -16,6 +16,7 @@
#include "debug.h"
#include "spy.h"
#include "tweak.h"
+#include "wine/winuser16.h"
/* Last COLOR id */
#define COLOR_MAX COLOR_BTNHIGHLIGHT
diff --git a/windows/driver.c b/windows/driver.c
index ecb277a..945f4a73 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -5,7 +5,7 @@
* Copyright 1998 Marcus Meissner
*/
-#include "windows.h"
+#include "wine/winuser16.h"
#include "heap.h"
#include "win.h"
#include "callback.h"
diff --git a/windows/msgbox.c b/windows/msgbox.c
index a045d23..2ea0539 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -4,7 +4,7 @@
* Copyright 1995 Bernd Schmidt
*/
-#include "windows.h"
+#include "wine/winuser16.h"
#include "dlgs.h"
#include "heap.h"
#include "module.h"
diff --git a/windows/painting.c b/windows/painting.c
index a2dab04..c099835 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -14,6 +14,7 @@
#include "dce.h"
#include "heap.h"
#include "debug.h"
+#include "wine/winuser16.h"
/* Last CTLCOLOR id */
#define CTLCOLOR_MAX CTLCOLOR_STATIC
diff --git a/windows/user.c b/windows/user.c
index 6b8a759..f08656d 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -22,7 +22,6 @@
#include "message.h"
#include "module.h"
#include "miscemu.h"
-#include "queue.h"
#include "shell.h"
#include "callback.h"
#include "x11drv.h"
diff --git a/windows/winhelp.c b/windows/winhelp.c
index 0019d0e..0dffbfa 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -7,7 +7,7 @@
#include <string.h>
#include <unistd.h>
#include "debug.h"
-#include "windows.h"
+#include "wine/winuser16.h"
#include "heap.h"
#include "ldt.h"