Include necessary header files to get compilation on OSX
Merge pull request #1 from afallou/master

Include necessary header files to get compilation on OSX