use correct include statements

I'm wondering how this could compile. (or alternatively: which drug
was I on when commiting this.)
Merge pull request #75 from andlaus/fix_include_statements

use correct include statements