winex11: Avoid depending on win.h.

dlls/winex11.drv/desktop.c

@@ -22,7 +22,6 @@
 #include <X11/cursorfont.h>
 #include <X11/Xlib.h>
 
-#include "win.h"
 #include "x11drv.h"
 
 /* avoid conflict with field names in included win32 headers */

dlls/winex11.drv/keyboard.c

@@ -45,7 +45,6 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "winnls.h"
-#include "win.h"
 #include "x11drv.h"
 #include "wine/server.h"
 #include "wine/unicode.h"

dlls/winex11.drv/mouse.c

@@ -41,7 +41,6 @@ MAKE_FUNCPTR(XcursorImageLoadCursor);
 #include "winbase.h"
 #include "wine/winuser16.h"
 
-#include "win.h"
 #include "x11drv.h"
 #include "wine/server.h"
 #include "wine/library.h"

dlls/winex11.drv/window.c

@@ -46,7 +46,6 @@
 #include "xcomposite.h"
 #include "wine/debug.h"
 #include "wine/server.h"
-#include "win.h"
 #include "mwm.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
@@ -70,8 +69,6 @@ static const char managed_prop[]      = "__wine_x11_managed";
 
 extern int usexcomposite;
 
-extern void WIN_invalidate_dce( HWND hwnd, const RECT *rect );  /* FIXME: to be removed */
-
 /***********************************************************************
  *		is_window_managed
  *

dlls/winex11.drv/winpos.c

@@ -33,7 +33,6 @@
 #include "wine/wingdi16.h"
 
 #include "x11drv.h"
-#include "win.h"
 
 #include "wine/server.h"
 #include "wine/debug.h"

dlls/winex11.drv/x11drv.h

@@ -746,4 +746,11 @@ LPDDHALMODEINFO X11DRV_Settings_SetHandlers(const char *name,
 
 extern void X11DRV_DDHAL_SwitchMode(DWORD dwModeIndex, LPVOID fb_addr, LPVIDMEM fb_mem);
 
+/* FIXME: private functions imported from user32 */
+extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode );
+extern BOOL WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow );
+extern void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, POINT *minTrack,
+                                  POINT *maxTrack );
+extern void WIN_invalidate_dce( HWND hwnd, const RECT *rect );
+
 #endif  /* __WINE_X11DRV_H */