Clean up for protobuf header warnings.