Fix compilation issues with builtin_davix CMake option