Feature/fix missing includes

Merged Timo Koch requested to merge feature/fix-missing-includes into master

Merge request reports