This is to make it so DIX ABI doesn't vary between rootless and non-rootless builds. Mostly a resend of a previous series, but #7 is new. - ajax