Merge "Include missing header"