Rearrange platform independent and dependent aliases/funcs