s3-proto: move remaining srvsvc protos to own header file.