Removed some includes of 16 bit API.

controls/uitools.c

@@ -5,7 +5,7 @@
  * Copyright 1997 Bertho A. Stultiens
  */
 
-#include "wine/winuser16.h"
+#include "winuser.h"
 #include "debug.h"
 
 DEFAULT_DEBUG_CHANNEL(graphics)

dlls/commdlg/finddlg.c

@@ -10,7 +10,6 @@
 #include <string.h>
 #include "winbase.h"
 #include "wine/winbase16.h"
-#include "wine/winuser16.h"
 #include "win.h"
 #include "message.h"
 #include "commdlg.h"

dlls/shell32/brsfolder.c

@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "wine/winuser16.h"
 #include "winerror.h"
 #include "heap.h"
 #include "resource.h"

dlls/version/info.c

@@ -11,7 +11,7 @@
 
 #include "winreg.h"
 #include "winver.h"
-#include "wine/winuser16.h"
+#include "wine/winestring.h"
 #include "winerror.h"
 #include "heap.h"
 #include "ver.h"

if1632/thunk.c

@@ -7,7 +7,6 @@
 
 #include <string.h>
 #include "wine/winbase16.h"
-#include "wine/winuser16.h"
 #include "hook.h"
 #include "callback.h"
 #include "task.h"

include/wine/winuser16.h

@@ -239,7 +239,7 @@ typedef struct
 } MINMAXINFO16;
 
   /* WM_WINDOWPOSCHANGING/CHANGED struct */
-typedef struct
+typedef struct tagWINDOWPOS16
 {
     HWND16  hwnd;
     HWND16  hwndInsertAfter;

memory/atom.c

@@ -17,8 +17,6 @@
 #include <ctype.h>
 
 #include "winuser.h"
-#include "wine/winbase16.h"
-#include "wine/winuser16.h"
 #include "instance.h"
 #include "ldt.h"
 #include "stackframe.h"

memory/string.c

@@ -7,8 +7,8 @@
 
 #include <ctype.h>
 #include <string.h>
-#include "wine/winbase16.h"
+#include "winbase.h"
-#include "wine/winuser16.h"
+#include "winuser.h"
 #include "wine/keyboard16.h"
 #include "winerror.h"
 #include "ldt.h"

misc/lstr.c

@@ -23,10 +23,9 @@
 
 
 #include "winbase.h"
-#include "winnls.h"
-#include "wine/winbase16.h"
 #include "winuser.h"
-#include "wine/winuser16.h"
+#include "wine/winbase16.h"
+#include "winnls.h"
 #include "task.h"
 #include "heap.h"
 #include "ldt.h"

multimedia/mcianim.c

@@ -11,7 +11,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include "windef.h"
-#include "wine/winuser16.h"
+#include "winuser.h"
 #include "driver.h"
 #include "mmsystem.h"
 #include "multimedia.h"

multimedia/mciavi.c

@@ -6,13 +6,12 @@
  * Copyright 1999 Eric POUECH
  */
 
-#include "wine/winuser16.h"
+#include "winuser.h"
 #include "multimedia.h"
 #include "user.h"
 #include "driver.h"
 #include "xmalloc.h"
 #include "debug.h"
-#include "callback.h"
 #include "digitalv.h"
 #include "options.h"
 

multimedia/mcimidi.c

@@ -21,8 +21,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include "callback.h"
+#include "winuser.h"
-#include "wine/winuser16.h"
 #include "ldt.h"
 #include "multimedia.h"
 #include "user.h"

multimedia/mciwave.c

@@ -20,7 +20,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include "wine/winuser16.h"
+#include "winuser.h"
 #include "driver.h"
 #include "multimedia.h"
 #include "mmsystem.h"

multimedia/midi.c

@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include "wine/winuser16.h"
+#include "winuser.h"
 #include "multimedia.h"
 #include "driver.h"
 #include "xmalloc.h"

objects/text.c

@@ -6,9 +6,8 @@
  */
 
 #include <string.h>
-#include "wingdi.h"
+#include "winbase.h"
 #include "winuser.h"
-#include "wine/winuser16.h"
 #include "dc.h"
 #include "gdi.h"
 #include "heap.h"

windows/caret.c

@@ -6,7 +6,6 @@
  */
 
 #include "winuser.h"
-#include "wine/winuser16.h"
 #include "module.h"
 #include "debug.h"
 

windows/rect.c

@@ -6,7 +6,6 @@
  */
 
 #include "winuser.h"
-#include "wine/winuser16.h"
 
 
 /***********************************************************************