plus some includes cleanup

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