Plus two trivial follow-up build fixes.

Change-Id: I7fe90c0a0033b4d9a341a4f0b8356d7f7133e93e
(cherry picked from commit b26ba85d)
(cherry picked from commit 2792868d)
(cherry picked from commit 1e8e3a8c)
Reviewed-on: https://gerrit.libreoffice.org/18011Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>