[Code health] include-what-you-use cleanup, part 2 (#2704)

[Code health] include-what-you-use cleanup, part 2 (#2704) #6345