diff --git a/src/misc.c b/src/misc.c
index 4c7fa3a5..88d0f9a8 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -38,6 +38,7 @@
 #include <X11/XKBlib.h>
 
 #include <WINGs/WUtil.h>
+#include <WINGs/WINGsP.h>
 #include <wraster.h>
 
 #include "window.h"
@@ -840,7 +841,7 @@ char *GetShortcutKey(WShortKey key)
 		}
 	}
 
-	key_name = XKeysymToString(XkbKeycodeToKeysym(dpy, key.keycode, 0, 0));
+	key_name = XKeysymToString(W_KeycodeToKeysym(dpy, key.keycode, 0));
 	if (!key_name)
 		return NULL;
 
diff --git a/src/xmodifier.c b/src/xmodifier.c
index 52088676..411a3a2a 100644
--- a/src/xmodifier.c
+++ b/src/xmodifier.c
@@ -36,6 +36,7 @@ Perpetrator: Sudish Joseph <sj@eng.mindspring.net>, Sept. 1997. */
 #include <X11/XKBlib.h>
 
 #include <WINGs/WUtil.h>
+#include <WINGs/WINGsP.h>
 #include "WindowMaker.h"
 #include "xmodifier.h"
 
@@ -174,7 +175,7 @@ static void x_reset_modifier_mapping(Display * display)
 				}
 
 				code = x_modifier_keymap->modifiermap[modifier_index * mkpm + modifier_key];
-				sym = (code ? XkbKeycodeToKeysym(display, code, 0, column) : NoSymbol);
+				sym = (code ? W_KeycodeToKeysym(display, code, column) : NoSymbol);
 
 				if (sym == last_sym)
 					continue;