Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
A bit of fallout management was needed.

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