Fix bug in --include and --include-from which didn't work as advertised;