diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 47e64b1530b4b231f90081647fbbd42b9e5c04c2..cff1645908f68bbd0d267b9468438c7e1e8e9bc7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -38,9 +38,11 @@ if ("${BUILD_LIB}" STREQUAL "yes")
         PUBLIC
           ${Boost_INCLUDE_DIRS}
           ${ROOT_DIR}/include
+          ${EXPRTK_INCLUDE_DIR}
 
         PRIVATE
             ${SRC_DIR}
+
 #            ${Boost_INCLUDE_DIRS}
     )
 
@@ -61,31 +63,16 @@ if ("${BUILD_LIB}" STREQUAL "yes")
         message(FATAL_ERROR "Only static linking of external dependencies is supported for Windows systems now!")
     elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
 		add_library(${PREFIX}boost_unit_test STATIC boost_test_lib_dummy.cpp)
-		add_library(${PREFIX}exprtk STATIC exprtk.cpp)
     elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared")
         add_library(${PREFIX}boost_unit_test SHARED boost_test_lib_dummy.cpp)
-        add_library(${PREFIX}exprtk SHARED exprtk.cpp)
 	endif()
 
     target_include_directories(
         ${PREFIX}boost_unit_test
 
-        PRIVATE
-            ${Boost_INCLUDE_DIRS}
-    )
-
-    target_include_directories(
-        ${PREFIX}exprtk
-
         PRIVATE
             ${EXPRTK_INCLUDE_DIR}
-    )
-
-    target_compile_definitions(
-        ${PREFIX}exprtk
-
-        PRIVATE
-            _ITERATOR_DEBUG_LEVEL=0
+            ${Boost_INCLUDE_DIRS}
     )
 
 endif ()
diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index eddc0ff6f1adf266f936e9a6e6ecf2a93126c982..e3cfe17fedfb7255f7df7294c8ba0fc5296c3b7a 100644
--- a/src/examples/CMakeLists.txt
+++ b/src/examples/CMakeLists.txt
@@ -1,7 +1,6 @@
 ############
 # EXAMPLES #
 ############
-
 add_executable(test_cases main.cpp)
 target_link_libraries(test_cases PUBLIC lib4neuro)