Found with bin/find-unneeded-includes
These were quite a bit entangled with each other
thus a lot of fallout management was necessary.

Also try harder to use fw declarations in files already checked

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