Hacked includes to try to work around a build failure on Trusty
Merge pull request #2 from gpjt/master

Hacked includes to try to work around a build failure on Trusty