Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

- Also fix .h / .hrc files
- Remove a bit of duplication from the .yaml file

Change-Id: I22145a79343497678e481d882544eb08e765312a
Reviewed-on: https://gerrit.libreoffice.org/65878
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>