Ignoring auto-import warning, minor prefix header changes.