merge and update patch from

http://bugzilla.gnome.org/show_bug.cgi?id=134895

capplets/accessibility/at-properties/at-startup-session.c

@@ -33,7 +33,7 @@ at_startup_string_compare (gconstpointer s1, gconstpointer s2)
 		return strcmp (s1, s2);
 	}
 	else
-		return (s2-s1);
+		return ((char *)s2-(char *)s1);
 }
 
 static GSList *

capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c

@@ -33,6 +33,7 @@
 #include "accessibility-keyboard.h"
 
 #ifdef HAVE_X11_EXTENSIONS_XKB_H
+#  include <X11/X.h>
 #  include <X11/Xlib.h>
 #  include <X11/XKBlib.h>
 #  include <X11/extensions/XKBstr.h>