fixup code, first compilable version with xorg-server 1.16.1