Ben Gamari authored Jun 10, 2019 and Marge Bot committed Jun 13, 2019

Strangely these were only causing the build to fail in the aarch64-linux
job, despite Sphinx throwing errors in all jobs I checked.

Also changes some `#ifdef`s to `#if defined` to satisfy the linter.