More include shuffling; keep X extension headers to ourselves

gdk/x11/gdkdevice-xi2.c

@@ -26,6 +26,10 @@
 #include "gdkasync.h"
 #include "gdkprivate-x11.h"
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XInput2.h>
+
 struct _GdkX11DeviceXI2
 {
   GdkDevice parent_instance;

gdk/x11/gdkdevicemanager-xi2.c

@@ -30,6 +30,10 @@
 #include "gdkintl.h"
 #include "gdkkeysyms.h"
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XInput2.h>
+
 #include <string.h>
 
 struct _GdkX11DeviceManagerXI2

gdk/x11/gdkdeviceprivate-xi.h

@@ -23,6 +23,10 @@
 #include "gdkx11device-xi.h"
 #include "gdkdeviceprivate.h"
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XInput.h>
+
 G_BEGIN_DECLS
 
 struct _GdkX11DeviceXI

gdk/x11/gdkprivate-x11.h

@@ -38,6 +38,12 @@
 #include "gdkwindow-x11.h"
 #include "gdkscreen-x11.h"
 #include "gdkdisplay-x11.h"
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/XInput.h>
+#include <X11/extensions/XInput2.h>
+
 #include <cairo-xlib.h>
 
 void _gdk_x11_error_handler_push (void);

gdk/x11/gdkx11device-xi.h

@@ -22,8 +22,6 @@
 
 #include <gdk/gdk.h>
 
-#include <X11/extensions/XInput.h>
-
 G_BEGIN_DECLS
 
 #define GDK_TYPE_X11_DEVICE_XI         (gdk_x11_device_xi_get_type ())

gdk/x11/gdkx11device-xi2.h

@@ -22,8 +22,6 @@
 
 #include <gdk/gdk.h>
 
-#include <X11/extensions/XInput2.h>
-
 G_BEGIN_DECLS
 
 #define GDK_TYPE_X11_DEVICE_XI2         (gdk_x11_device_xi2_get_type ())

gdk/x11/gdkx11devicemanager-xi2.h

@@ -22,8 +22,6 @@
 
 #include <gdk/gdk.h>
 
-#include <X11/extensions/XInput2.h>
-
 G_BEGIN_DECLS
 
 #define GDK_TYPE_X11_DEVICE_MANAGER_XI2         (gdk_x11_device_manager_xi2_get_type ())