Bring tools up to date with XWayland current git dependencies