Merge pull request #140 from ninneman/devel

Fix compile errors due to missing header includes.