A couple of include fixes
Merge pull request #11 from jstamp/include-fixes

A couple of include fixes