s3:includes: move union unid_t to vfs.h