Preventing infinite recursion when resolving includes. Closes #255