diff --git a/omnioperator/omniop-spark-extension/cpp/CMakeLists.txt b/omnioperator/omniop-spark-extension/cpp/CMakeLists.txt
index 03cdf8c441b1b797b4ebb92fc063f2144ba1cd8f..8d48bb1c52e08f12e1607404bf68007706793ffd 100644
--- a/omnioperator/omniop-spark-extension/cpp/CMakeLists.txt
+++ b/omnioperator/omniop-spark-extension/cpp/CMakeLists.txt
@@ -20,6 +20,10 @@ aux_source_directory(${CMAKE_CURRENT_LIST_DIR} ROOT_SRCS)
 # for header searching
 include_directories(SYSTEM src)
 
+message(STATUS "ENV OMNI_OPERATOR_PATH: $ENV{OMNI_OPERATOR_PATH}")
+
+include_directories(SYSTEM $ENV{OMNI_OPERATOR_PATH)
+
 # compile library
 add_subdirectory(src)
 
diff --git a/omnioperator/omniop-spark-extension/cpp/build.sh b/omnioperator/omniop-spark-extension/cpp/build.sh
index 06f031febdaf521b65fc1e2481d87c537c2f5307..ea1a1cf286efca9549267d3eb6bdd0d9efcaa152 100644
--- a/omnioperator/omniop-spark-extension/cpp/build.sh
+++ b/omnioperator/omniop-spark-extension/cpp/build.sh
@@ -17,9 +17,9 @@
 
 set -eu
 
-export OMNI_INCLUDE_PATH=/opt/lib/include
-export CPLUS_INCLUDE_PATH=$OMNI_INCLUDE_PATH
-echo "OMNI_INCLUDE_PATH=$OMNI_INCLUDE_PATH"
+export OMNI_OPERATOR_PATH=/opt/lib
+export CPLUS_INCLUDE_PATH=$OMNI_OPERATOR_PATH/include
+echo "OMNI_OPERATOR_PATH=$OMNI_OPERATOR_PATH"
 
 CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
 echo $CURRENT_DIR