Remove arbitrary division between xcb_types and xproto by merging