Some more IWYU fixes.

Daniel Pfeiferrequested to merge
purpleKarrot/cmake:iwyu into master

I hope I can make the IWYU build Continuous soon.

Merge request reports