Patch from Luchezar Georgiev (unused variables when building without X11).
Authored by: debug 2021-02-22
Parent: [r6348]
Child: [r6350]
