Drop the XS- before Vcs-headers