Improve handling of nested includes