From 82fe7594f993ddeee236f27c9877e98006723a1c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 21 Dec 2010 14:17:02 -0500
Subject: [PATCH] More include shuffling; keep X extension headers to ourselves

---
 gdk/x11/gdkdevice-xi2.c           | 4 ++++
 gdk/x11/gdkdevicemanager-xi2.c    | 4 ++++
 gdk/x11/gdkdeviceprivate-xi.h     | 4 ++++
 gdk/x11/gdkprivate-x11.h          | 6 ++++++
 gdk/x11/gdkx11device-xi.h         | 2 --
 gdk/x11/gdkx11device-xi2.h        | 2 --
 gdk/x11/gdkx11devicemanager-xi2.h | 2 --
 7 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/gdk/x11/gdkdevice-xi2.c b/gdk/x11/gdkdevice-xi2.c
index 53367fd47d..78b9de693a 100644
--- a/gdk/x11/gdkdevice-xi2.c
+++ b/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;
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 83ab51c6fe..465099f577 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/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
diff --git a/gdk/x11/gdkdeviceprivate-xi.h b/gdk/x11/gdkdeviceprivate-xi.h
index b94ec47f6e..05df1ee5ab 100644
--- a/gdk/x11/gdkdeviceprivate-xi.h
+++ b/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
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index fa134c72c0..d4114c9108 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/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);
diff --git a/gdk/x11/gdkx11device-xi.h b/gdk/x11/gdkx11device-xi.h
index 061f8dfcdd..65e5295622 100644
--- a/gdk/x11/gdkx11device-xi.h
+++ b/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 ())
diff --git a/gdk/x11/gdkx11device-xi2.h b/gdk/x11/gdkx11device-xi2.h
index 85fe788714..15f7db6a80 100644
--- a/gdk/x11/gdkx11device-xi2.h
+++ b/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 ())
diff --git a/gdk/x11/gdkx11devicemanager-xi2.h b/gdk/x11/gdkx11devicemanager-xi2.h
index 38c351b598..acae52bc62 100644
--- a/gdk/x11/gdkx11devicemanager-xi2.h
+++ b/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 ())