Move common aliases outside ifdefine block

Change-Id: Iee8fa422a054ff4c25a2fb71a435b13ff3f1ab2f