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

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