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

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