diff --git a/Findexprtk.cmake b/Findexprtk.cmake
index f23d05cfe05cd6f7f53fadbb6f52786b5040acd8..4b84c47d4e3b2e2a718f03b2751a385c76e8a7d9 100644
--- a/Findexprtk.cmake
+++ b/Findexprtk.cmake
@@ -46,5 +46,3 @@ ENDIF(EXPRTK_FOUND)
 
 # Advanced options for not cluttering the cmake UIs:
 MARK_AS_ADVANCED(EXPRTK_INCLUDE_DIR)
-
-include_directories(${EXPRTK_INCLUDE_DIRS})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e014431211f871e3c9b84072dc52ce02aea959d8..47e64b1530b4b231f90081647fbbd42b9e5c04c2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,10 +54,9 @@ if ("${BUILD_LIB}" STREQUAL "yes")
     )
 
     set(PREFIX "")
-    if(WIN32)
+#    if(WIN32)
 #        set(PREFIX "lib")
-    endif()
-
+#    endif()
 	if(WIN32 AND "${DEPENDENCIES_LINK_TYPE}" STREQUAL "shared")
         message(FATAL_ERROR "Only static linking of external dependencies is supported for Windows systems now!")
     elseif("${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
@@ -75,5 +74,19 @@ if ("${BUILD_LIB}" STREQUAL "yes")
             ${Boost_INCLUDE_DIRS}
     )
 
+    target_include_directories(
+        ${PREFIX}exprtk
+
+        PRIVATE
+            ${EXPRTK_INCLUDE_DIR}
+    )
+
+    target_compile_definitions(
+        ${PREFIX}exprtk
+
+        PRIVATE
+            _ITERATOR_DEBUG_LEVEL=0
+    )
+
 endif ()