--- a/src/video/x11/SDL_x11events.c	Fri Jun 26 20:12:10 2015 +0200
+++ b/src/video/x11/SDL_x11events.c	Thu Jun 25 07:17:08 2015 -0700
@@ -789,7 +789,7 @@
 #if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
                 keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
 #else
-                keysym = XKeycodeToKeysym(display, keycode, 0);
+                keysym = X11_XKeycodeToKeysym(display, keycode, 0);
 #endif
                 fprintf(stderr,
                         "The key you just pressed is not recognized by SDL. To help get this fixed, please report this to the SDL mailing list <sdl@libsdl.org> X11 KeyCode %d (%d), X11 KeySym 0x%lX (%s).\n",

--- a/src/video/x11/SDL_x11keyboard.c	Fri Jun 26 20:12:10 2015 +0200
+++ b/src/video/x11/SDL_x11keyboard.c	Thu Jun 25 07:17:08 2015 -0700
@@ -154,7 +154,7 @@
 #if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
     keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
 #else
-    keysym = XKeycodeToKeysym(display, keycode, 0);
+    keysym = X11_XKeycodeToKeysym(display, keycode, 0);
 #endif
     if (keysym == NoSymbol) {
         return SDL_SCANCODE_UNKNOWN;
@@ -184,7 +184,7 @@
 #if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
     keysym = X11_XkbKeycodeToKeysym(display, keycode, 0, 0);
 #else
-    keysym = XKeycodeToKeysym(display, keycode, 0);
+    keysym = X11_XKeycodeToKeysym(display, keycode, 0);
 #endif
     if (keysym == NoSymbol) {
         return 0;
@@ -265,7 +265,7 @@
 #if SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
             sym = X11_XkbKeycodeToKeysym(data->display, i, 0, 0);
 #else
-            sym = XKeycodeToKeysym(data->display, i, 0);
+            sym = X11_XKeycodeToKeysym(data->display, i, 0);
 #endif
             if (sym != NoSymbol) {
                 SDL_Scancode scancode;