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

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