Do some IWYU cleanups.