Be less paranoid about include defines. Closes #654