Fix up the autoinclusion rules for the utilities and recoveryimage target.