diff --git a/patches/user32-rawinput-mouse/0001-winex11.drv-Split-XInput2-thread-initialization.patch b/patches/user32-rawinput-mouse/0001-winex11.drv-Split-XInput2-thread-initialization.patch
index b5872c27..004308d0 100644
--- a/patches/user32-rawinput-mouse/0001-winex11.drv-Split-XInput2-thread-initialization.patch
+++ b/patches/user32-rawinput-mouse/0001-winex11.drv-Split-XInput2-thread-initialization.patch
@@ -1,4 +1,4 @@
-From 1061a45af693c2cb526a3d83209397b483346b47 Mon Sep 17 00:00:00 2001
+From 1d5433cc0d7cd37af7c79fb2468c02b1c5a9a9ac Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Fri, 17 Jan 2020 16:33:11 +0100
 Subject: [PATCH] winex11.drv: Split XInput2 thread initialization.
@@ -6,9 +6,9 @@ Subject: [PATCH] winex11.drv: Split XInput2 thread initialization.
 And rename the library and function loader to x11drv_xinput_load.
 ---
  dlls/winex11.drv/mouse.c       | 46 +++++++++++++++++++++++-----------
- dlls/winex11.drv/x11drv.h      |  4 +--
+ dlls/winex11.drv/x11drv.h      |  3 ++-
  dlls/winex11.drv/x11drv_main.c |  4 ++-
- 3 files changed, 36 insertions(+), 18 deletions(-)
+ 3 files changed, 36 insertions(+), 17 deletions(-)
 
 diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
 index 612fff9995c..911e93d8de1 100644
@@ -93,14 +93,13 @@ index 612fff9995c..911e93d8de1 100644
  #if defined(SONAME_LIBXI) && defined(HAVE_X11_EXTENSIONS_XINPUT2_H)
      int event, error;
 diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
-index 2917579927c..050008d2bfb 100644
+index 2917579927c..fd69e55054c 100644
 --- a/dlls/winex11.drv/x11drv.h
 +++ b/dlls/winex11.drv/x11drv.h
-@@ -260,8 +260,8 @@ extern void X11DRV_ThreadDetach(void);
- 
+@@ -261,7 +261,8 @@ extern void X11DRV_ThreadDetach(void);
  /* X11 driver internal functions */
  
--extern void X11DRV_Xcursor_Init(void);
+ extern void X11DRV_Xcursor_Init(void);
 -extern void X11DRV_XInput2_Init(void);
 +extern void x11drv_xinput_load(void);
 +extern void x11drv_xinput_init(void);
diff --git a/patches/user32-rawinput-mouse/0002-winex11.drv-Support-XInput2-events-for-individual-wi.patch b/patches/user32-rawinput-mouse/0002-winex11.drv-Support-XInput2-events-for-individual-wi.patch
index dff00828..725c5ab3 100644
--- a/patches/user32-rawinput-mouse/0002-winex11.drv-Support-XInput2-events-for-individual-wi.patch
+++ b/patches/user32-rawinput-mouse/0002-winex11.drv-Support-XInput2-events-for-individual-wi.patch
@@ -1,4 +1,4 @@
-From 3c844a24ee63c1fac2db8a1f99ea11db4a118213 Mon Sep 17 00:00:00 2001
+From e37bc9f0f5554b56861fd3971d1611e8f6db9448 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
 Date: Thu, 23 Jan 2020 11:00:19 +0100
 Subject: [PATCH] winex11.drv: Support XInput2 events for individual windows.
@@ -214,11 +214,11 @@ index 53982bb8c3b..c2d7e850656 100644
          NtUserSetProp( hwnd, clip_window_prop, (HANDLE)data->clip_window );
          X11DRV_DisplayDevices_RegisterEventHandlers();
 diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
-index 050008d2bfb..f087eccd35b 100644
+index fd69e55054c..1f96716b2ad 100644
 --- a/dlls/winex11.drv/x11drv.h
 +++ b/dlls/winex11.drv/x11drv.h
-@@ -262,6 +262,8 @@ extern void X11DRV_ThreadDetach(void);
- 
+@@ -263,6 +263,8 @@ extern void X11DRV_ThreadDetach(void);
+ extern void X11DRV_Xcursor_Init(void);
  extern void x11drv_xinput_load(void);
  extern void x11drv_xinput_init(void);
 +extern void x11drv_xinput_enable( Display *display, Window window, long event_mask );
@@ -226,7 +226,7 @@ index 050008d2bfb..f087eccd35b 100644
  
  extern DWORD copy_image_bits( BITMAPINFO *info, BOOL is_r8g8b8, XImage *image,
                                const struct gdi_image_bits *src_bits, struct gdi_image_bits *dst_bits,
-@@ -376,6 +378,14 @@ struct x11drv_escape_flush_gl_drawable
+@@ -377,6 +379,14 @@ struct x11drv_escape_flush_gl_drawable
   * X11 USER driver
   */
  
@@ -241,7 +241,7 @@ index 050008d2bfb..f087eccd35b 100644
  struct x11drv_thread_data
  {
      Display *display;
-@@ -391,7 +401,7 @@ struct x11drv_thread_data
+@@ -392,7 +402,7 @@ struct x11drv_thread_data
      Window   clip_window;          /* window used for cursor clipping */
      BOOL     clipping_cursor;      /* whether thread is currently clipping the cursor */
  #ifdef HAVE_X11_EXTENSIONS_XINPUT2_H