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

diff --git a/controls/scroll.c b/controls/scroll.c
index 901873f..6748222 100644
--- a/controls/scroll.c
+++ b/controls/scroll.c
@@ -5,6 +5,8 @@
  * Copyright 1994, 1996 Alexandre Julliard
  */
 
+#include "windef.h"
+#include "wingdi.h"
 #include "wine/winuser16.h"
 #include "scroll.h"
 #include "heap.h"