s3:include: remove typedef user_struct