This partially reverts commit 30ac332563. https://groups.google.com/forum/#!msg/xorg-devel/SvgqiQnSN7c/f0wjRhauqvUJ It's sad that the currently *released* versions don't even compile together, and no dev reacts for four days so far...
30ac332563