diff -Naur a/x11.vapi b/x11.vapi
--- a/x11.vapi	2011-03-31 01:57:13.395022312 +0200
+++ b/x11.vapi	2011-04-01 16:46:51.723714836 +0200
@@ -88,7 +88,7 @@
 		public void force_screensaver (int mode);
 
 		[CCode (cname = "XGetKeyboardMapping", array_length = false)]
-		public unowned uint[] get_keyboard_mapping (uint first_keycode, int keycode_count, ref int keysyms_per_keycode_return);
+		public unowned ulong* get_keyboard_mapping (uchar first_keycode, int keycode_count, ref int keysyms_per_keycode_return);
 
 		[CCode (cname = "XGetModifierMapping")]
 		public ModifierKeymap get_modifier_mapping ();
@@ -133,7 +133,7 @@
 		public int keycodes (ref int min_keycodes_return, ref int max_keycodes_return);
 
 		[CCode (cname = "XKeysymToKeycode")]
-		public int keysym_to_keycode (uint keysym);
+		public uchar keysym_to_keycode (ulong keysym);
 
 		[CCode (cname = "XLastKnownRequestProcessed")]
 		public ulong last_known_request_processed ();