Try to fix missing includes in cmake build
Merge branch 'master' of github.com:qomp/qomp