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