Improving the includes with some help from 'include-what-you-use'.