diff --git a/controls/uitools.c b/controls/uitools.c
index 0daff1c6ad0..e2ded59d175 100644
--- a/controls/uitools.c
+++ b/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)
diff --git a/dlls/commdlg/finddlg.c b/dlls/commdlg/finddlg.c
index 19e9e3f773a..353e50eac39 100644
--- a/dlls/commdlg/finddlg.c
+++ b/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"
diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c
index ebc24411607..65d130b9b27 100644
--- a/dlls/shell32/brsfolder.c
+++ b/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"
diff --git a/dlls/version/info.c b/dlls/version/info.c
index 5f23b9aea59..dcc295b3634 100644
--- a/dlls/version/info.c
+++ b/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"
diff --git a/if1632/thunk.c b/if1632/thunk.c
index 666596210bc..bfa4c8b2c35 100644
--- a/if1632/thunk.c
+++ b/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"
diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h
index 827b17dfa75..8b72291d1da 100644
--- a/include/wine/winuser16.h
+++ b/include/wine/winuser16.h
@@ -239,7 +239,7 @@ typedef struct
 } MINMAXINFO16;
 
   /* WM_WINDOWPOSCHANGING/CHANGED struct */
-typedef struct
+typedef struct tagWINDOWPOS16
 {
     HWND16  hwnd;
     HWND16  hwndInsertAfter;
diff --git a/memory/atom.c b/memory/atom.c
index 2ade44460da..07516d9da99 100644
--- a/memory/atom.c
+++ b/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"
diff --git a/memory/string.c b/memory/string.c
index 2fd55e8c880..72367b23a6a 100644
--- a/memory/string.c
+++ b/memory/string.c
@@ -7,8 +7,8 @@
 
 #include <ctype.h>
 #include <string.h>
-#include "wine/winbase16.h"
-#include "wine/winuser16.h"
+#include "winbase.h"
+#include "winuser.h"
 #include "wine/keyboard16.h"
 #include "winerror.h"
 #include "ldt.h"
diff --git a/misc/lstr.c b/misc/lstr.c
index 084fdca87b4..7f2e674a722 100644
--- a/misc/lstr.c
+++ b/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"
diff --git a/multimedia/mcianim.c b/multimedia/mcianim.c
index 2076b5b4840..9c4084507ec 100644
--- a/multimedia/mcianim.c
+++ b/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"
diff --git a/multimedia/mciavi.c b/multimedia/mciavi.c
index f56d8b36a4f..0dd3bdd1ce2 100644
--- a/multimedia/mciavi.c
+++ b/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"
 
diff --git a/multimedia/mcimidi.c b/multimedia/mcimidi.c
index ddda8203c1f..3816fc6399b 100644
--- a/multimedia/mcimidi.c
+++ b/multimedia/mcimidi.c
@@ -21,8 +21,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
-#include "callback.h"
-#include "wine/winuser16.h"
+#include "winuser.h"
 #include "ldt.h"
 #include "multimedia.h"
 #include "user.h"
diff --git a/multimedia/mciwave.c b/multimedia/mciwave.c
index 216fae625e4..6b6ec27413a 100644
--- a/multimedia/mciwave.c
+++ b/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"
diff --git a/multimedia/midi.c b/multimedia/midi.c
index 872852974f5..a9767928f44 100644
--- a/multimedia/midi.c
+++ b/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"
diff --git a/objects/text.c b/objects/text.c
index 727e891fd35..00a0923a65e 100644
--- a/objects/text.c
+++ b/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"
diff --git a/windows/caret.c b/windows/caret.c
index d66a03bfef7..a0b5e6b1698 100644
--- a/windows/caret.c
+++ b/windows/caret.c
@@ -6,7 +6,6 @@
  */
 
 #include "winuser.h"
-#include "wine/winuser16.h"
 #include "module.h"
 #include "debug.h"
 
diff --git a/windows/rect.c b/windows/rect.c
index e7f924c88cf..58340640335 100644
--- a/windows/rect.c
+++ b/windows/rect.c
@@ -6,7 +6,6 @@
  */
 
 #include "winuser.h"
-#include "wine/winuser16.h"
 
 
 /***********************************************************************