Wrong include files were included. Corrected this.
CRA-570
Merge branch 'master' of git://github.com/CRAVA/crava
Merge pull request #72 from fjellvoll/master

CRA-570