Found with bin/find-unneeded-includes
Mostly removal proposals are dealt with here
and a few trivial substitutions in small headers

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