Reduce header dependencies in server classes
5 files changed