Update xlib.h

unify dict and set macros and constants.