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

Change-Id: Ie86a34f7f091525f21369f989165a56eace70513
Reviewed-on: https://gerrit.libreoffice.org/55558
Tested-by: Jenkins
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>