Merge pull request #3 from lukegb/fix-includes