Attempted fix at INCLUDE_PATH issue

This will fix #456, but I'm going to submit it as a pull request, and someone can merge after testing/review to make sure I'm not messing up the logic here.