Removed unused includes

Merged Gräser, Carsten requested to merge cleanup/remove-unused-includes into master

Merge request reports