diff --git a/omnioperator/omniop-spark-extension/cpp/build.sh b/omnioperator/omniop-spark-extension/cpp/build.sh
index 26f83e2cb612fc3af663d955df4bcabac177997b..bb53aec9b32d9a0e6fda7609c4c32fbe6ab37ece 100644
--- a/omnioperator/omniop-spark-extension/cpp/build.sh
+++ b/omnioperator/omniop-spark-extension/cpp/build.sh
@@ -17,6 +17,10 @@
 
 set -eu
 
+export OMNI_INCLUDE_PATH=/opt/lib/include
+export CPLUS_INCLUDE_PATH=$OMNI_INCLUDE_PATH
+echo "OMNI_INCLUDE_PATH=$OMNI_INCLUDE_PATH"
+
 CURRENT_DIR=$(cd "$(dirname "$BASH_SOURCE")"; pwd)
 echo $CURRENT_DIR
 cd ${CURRENT_DIR}
@@ -53,4 +57,4 @@ fi
 
 make
 
-set +eu
\ No newline at end of file
+set +eu
diff --git a/omnioperator/omniop-spark-extension/cpp/src/CMakeLists.txt b/omnioperator/omniop-spark-extension/cpp/src/CMakeLists.txt
index a1cce13ba2d28f84d0f5ef60b43a290e279ac933..0169e31f9ffa25561562dcc3dce7174387e6c6b1 100644
--- a/omnioperator/omniop-spark-extension/cpp/src/CMakeLists.txt
+++ b/omnioperator/omniop-spark-extension/cpp/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-include_directories(SYSTEM "/opt/lib/include")
 include_directories(SYSTEM "/user/local/include")
 
 set (PROJ_TARGET spark_columnar_plugin)
@@ -34,7 +33,6 @@ add_library (${PROJ_TARGET} SHARED ${SOURCE_FILES} ${PROTO_SRCS} ${PROTO_HDRS} $
 target_include_directories(${PROJ_TARGET} PUBLIC $ENV{JAVA_HOME}/include)
 target_include_directories(${PROJ_TARGET} PUBLIC $ENV{JAVA_HOME}/include/linux)
 target_include_directories(${PROJ_TARGET} PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
-target_include_directories(${PROJ_TARGET} PUBLIC /opt/lib/include)
 
 target_link_libraries (${PROJ_TARGET} PUBLIC
         orc
diff --git a/omnioperator/omniop-spark-extension/cpp/test/shuffle/CMakeLists.txt b/omnioperator/omniop-spark-extension/cpp/test/shuffle/CMakeLists.txt
index ff8bf512a412063f3adb32e6bf02f3fd672ea797..178c781c0307edb9060dd8a5a5533412aa51d61b 100644
--- a/omnioperator/omniop-spark-extension/cpp/test/shuffle/CMakeLists.txt
+++ b/omnioperator/omniop-spark-extension/cpp/test/shuffle/CMakeLists.txt
@@ -3,8 +3,5 @@ set(SHUFFLE_TEST_TARGET shuffletest)
 add_library(${SHUFFLE_TEST_TARGET} STATIC ${SHUFFLE_TESTS_LIST})
 target_compile_options(${SHUFFLE_TEST_TARGET} PUBLIC )
 target_include_directories(${SHUFFLE_TEST_TARGET} PUBLIC ${CMAKE_BINARY_DIR}/src)
-target_include_directories(${SHUFFLE_TEST_TARGET} PUBLIC /opt/lib/include)
 target_include_directories(${SHUFFLE_TEST_TARGET} PUBLIC $ENV{JAVA_HOME}/include)
 target_include_directories(${SHUFFLE_TEST_TARGET} PUBLIC $ENV{JAVA_HOME}/include/linux)
-
-
diff --git a/omnioperator/omniop-spark-extension/cpp/test/tablescan/CMakeLists.txt b/omnioperator/omniop-spark-extension/cpp/test/tablescan/CMakeLists.txt
index ad201c2a601781fecad4bee63cfd2ba57f80a880..8ca2b6d593af0afccf671d38947c175f33fab157 100644
--- a/omnioperator/omniop-spark-extension/cpp/test/tablescan/CMakeLists.txt
+++ b/omnioperator/omniop-spark-extension/cpp/test/tablescan/CMakeLists.txt
@@ -8,6 +8,3 @@ target_compile_options(${SCAN_TEST_TARGET} PUBLIC )
 
 target_include_directories(${SCAN_TEST_TARGET} PUBLIC $ENV{JAVA_HOME}/include)
 target_include_directories(${SCAN_TEST_TARGET} PUBLIC $ENV{JAVA_HOME}/include/linux)
-target_include_directories(${SCAN_TEST_TARGET} PUBLIC /opt/lib/include)
-
-
diff --git a/omnioperator/omniop-spark-extension/cpp/test/utils/CMakeLists.txt b/omnioperator/omniop-spark-extension/cpp/test/utils/CMakeLists.txt
index 0865325fc7c231363d6a09fb937e047f1bd0be5f..d5ef3a300b492d20afe78550cab6fdc7635b5cc5 100644
--- a/omnioperator/omniop-spark-extension/cpp/test/utils/CMakeLists.txt
+++ b/omnioperator/omniop-spark-extension/cpp/test/utils/CMakeLists.txt
@@ -1,8 +1,6 @@
 aux_source_directory(${CMAKE_CURRENT_LIST_DIR} UTILS_TESTS_LIST)
 set(UTILS_TEST_TARGET utilstest)
 add_library(${UTILS_TEST_TARGET} ${UTILS_TESTS_LIST})
-target_include_directories(${UTILS_TEST_TARGET} PUBLIC /opt/lib/include)
 target_include_directories(${UTILS_TEST_TARGET} PUBLIC ${CMAKE_BINARY_DIR}/src)
 target_include_directories(${UTILS_TEST_TARGET} PUBLIC $ENV{JAVA_HOME}/include)
 target_include_directories(${UTILS_TEST_TARGET} PUBLIC $ENV{JAVA_HOME}/include/linux)
-