Improve include path checking