clean up use of includes (with include-what-you-use)