Cleanup include dependencies

This is for maintainability.