Patches for xcb/proto