Log Message: Fix build problem with modular Xorg. Problem reported and fix confirmed by Pierre Pronchery in PR 36597.