header adaptions
cpp-src adaptions
cmake-improves