Bug fix: support plural results of includes