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

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