Make include dependencies neater, and adheres to the coding convention that headers should not include headers.
