Remove include of obsolete header files

Merged Gerhard Raven requested to merge remove_obsolete_headers into master

Merge request reports