Found with bin/find-unneeded-includes
Only removal proposals are dealt with here,
with a bit of fallout management

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