Update includes

with suggestions by include-what-you-use