I think the typical meaning is a system that responds to requests with data. I think this is a usable definition. By default it includes P2P, but you can always add 'except P2P'. X servers don't fit this definition, which seems correct to me.

oops. sorry. I misread your earlier comment.