Add missing includes.
Merge pull request #39 from bchretien/master

Add missing includes.