Add missing headers.
Merge pull request #4 from hfiguiere/header-fixes

Add missing headers.