Add missing includes to fix headercheck

Merged Kilian Weishaupt requested to merge fix/headercheck into master

Merge request reports