- Fix headers to include less or smaller header files.
- Fix header and source files to include missing header files to avoid
  warnings and errors.

diff --git a/controls/menu.c b/controls/menu.c
index 5e17d07..b1a1445 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -20,6 +20,7 @@
 #include "bitmap.h"
 #include "win.h"
 #include "wine/winbase16.h"
+#include "wine/winuser16.h"
 #include "sysmetrics.h"
 #include "task.h"
 #include "heap.h"