Fix incorrect header inclusion and close pull request #1.