Adding -i INCLUDEFILES argument

OK, implemented, indeed looks cleaner.