--- a/src/event-gtk.c	Sun Jan 31 21:11:44 2010 -0600
+++ b/src/event-gtk.c	Mon Feb 01 05:29:05 2010 -0600
@@ -49,11 +49,11 @@
 
 #include "gtk-xemacs.h"
 
+#include "sysgdkx.h"
+
 #include "systime.h"
 #include "sysproc.h" /* for MAXDESC */
 
-#include <gdk/gdkkeysyms.h>
-
 #ifdef HAVE_DRAGNDROP
 #include "dragdrop.h"
 #endif
@@ -62,10 +62,6 @@
 # include "menubar.h"
 #endif
 
-#include <gdk/gdkx.h>
-
-#include "event-gtk.h"
-
 static struct event_stream *gtk_event_stream;
 
 #ifdef WIN32_ANY
@@ -1582,8 +1578,6 @@
 /*                      input pending / C-g checking                    */
 /************************************************************************/
 
-#include <gdk/gdkx.h>
-
 static void
 emacs_gtk_drain_queue (void)
 
@@ -1692,7 +1686,7 @@
 /* This is down at the bottom of the file so I can avoid polluting the
    generic code with this X specific CRAP! */
 
-#include <gdk/gdkx.h>
+#include "sysgdkx.h"
 #include <X11/keysym.h>
 /* #### BILL!!! Fix this please! */