Catch VS integration Part 2 - modify version, allow multiple includes