updated include paths (CMake+osxtest) and function prototype (osxtest)

fixes compilation with changes from e5c99175c55e3b08493058d4aefcf31f62018ac1