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

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