Found with bin/find-unneeded-includes
Only removal proposals/trivial replacements are dealt with here.

Change-Id: I0ad6772012c771e8ab3f3f42af26f9ac05615771
Reviewed-on: https://gerrit.libreoffice.org/54147Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>