You removed building tags from a lot of objects in this changeset - it's fine to have man_made=* along with a building tag. Also, it might be better to tag the outer way as man_made=water_works and tag the buildings themselves as building=industrial or similar.