Update includes/forward declarations

with suggestions by include-what-you-use