[FIXES-#591] Fixes wrong source includes.
Merge pull request #748 from rrahn/release/fix/issue591

[FIXES-#591] Fixes wrong source includes.