Merge "Fix missing #includes in system/extras."