Fixed compile errors
Fixed includes
Merge pull request #53 from simongog/compile_fixes

Fixed compile errors