Fix matching of includes and excludes