Reduce header dependencies.
2 files changed