Include header files whose declarations are used
Merge pull request #2 from jeroenk/header

Include header files whose declarations are used