so we have all the related definitions in the same header file

Change-Id: I8032c2ae36bc9dd860069b3dafd69207d5636501
Reviewed-on: https://gerrit.libreoffice.org/42187Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>