include: search if $INCLUDE_PATH in even if no <*>
added some missing edits