xorg: fixes for building with xserver v1.13+