Update for xcb git repository split/module renaming