[cleanup] Remove moved headers

Merged Timo Koch requested to merge cleanup/remove-deprecated-headers into master

Merge request reports