More changes to define includes/excludes as arrays.