Reorganise x11 a tad so glx can reuse the defined types and structures.