--- a/src/video/x11/SDL_x11events.c	Sat Jun 21 12:50:03 2014 -0700
+++ b/src/video/x11/SDL_x11events.c	Sat Jun 21 17:25:59 2014 -0700
@@ -571,7 +571,9 @@
             KeySym keysym = NoSymbol;
             char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];
             Status status = 0;
+#ifdef SDL_USE_IBUS
             Bool handled = False;
+#endif
 
 #ifdef DEBUG_XEVENTS
             printf("window %p: KeyPress (X11 keycode = 0x%X)\n", data, xevent.xkey.keycode);

--- a/src/video/x11/SDL_x11video.h	Sat Jun 21 12:50:03 2014 -0700
+++ b/src/video/x11/SDL_x11video.h	Sat Jun 21 17:25:59 2014 -0700
@@ -53,13 +53,8 @@
 #include <X11/extensions/xf86vmode.h>
 #endif
 
-#ifdef HAVE_DBUS_DBUS_H
 #include "../../core/linux/SDL_dbus.h"
-#endif
-
-#ifdef HAVE_IBUS_IBUS_H
 #include "../../core/linux/SDL_ibus.h"
-#endif
 
 #include "SDL_x11dyn.h"