Removed #include of wingdi.h and windef.h from winuser.h (and resolved
the resulting compilation failures).

diff --git a/controls/menu.c b/controls/menu.c
index a2f5aba..a277ecb 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -17,9 +17,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "win.h"
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
+#include "win.h"
 #include "task.h"
 #include "heap.h"
 #include "menu.h"