Use typedefs (eg, LX_XID) where appropriate in lx.h. There still remains code in the .c files which should be converted to use the LX_[SU]* types.