s3-build: remove some unused/duplicate headers.