Reorder deps and re-add xerces exclusion