avoid putting more includes in headers than necessary
2 files changed