Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Thanks to codemaker changes there are more
warnings to fix than before.
Also try harder to use fw declarations.

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