Mostly as a way to compare the EGL and GLX implementations.
Move things to the private headers they belong in.