Modified include regular expression and parsing