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

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