Move RIL defs to common