Cmake correct includes

created branch 462-cmake-correct-includes to address this issue

mentioned in merge request !453 (merged)

mentioned in commit 05472061

closed with merge request !453 (merged)