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