diff --git a/Applications/ApplicationsLib/CMakeLists.txt b/Applications/ApplicationsLib/CMakeLists.txt
index dabcefc541e5bc8ce67ff371e53bdb8fab64aa44..efef4eb9b177c737b44b50d709b5740c3a4e2935 100644
--- a/Applications/ApplicationsLib/CMakeLists.txt
+++ b/Applications/ApplicationsLib/CMakeLists.txt
@@ -18,6 +18,10 @@ target_link_libraries(
             $<$<BOOL:${OGS_USE_PYTHON}>:pybind11::pybind11>
 )
 
+if(OGS_USE_LIS)
+    target_include_directories(ApplicationsLib PUBLIC ${LIS_INCLUDE_DIR})
+endif()
+
 target_compile_definitions(
     ApplicationsLib PUBLIC $<$<BOOL:${USE_LIS}>:USE_LIS>
                            $<$<BOOL:${OGS_USE_PETSC}>:USE_PETSC>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 227945e2e9721c698c3d4f577dc0b6931d468bcd..34e7211edf8da92cd30c2f478182bb270dd7ef4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,13 +187,6 @@ option(OGS_USE_MFRONT
        OFF
 )
 # ---- Definitions ----
-if(OGS_USE_LIS)
-    include_directories(SYSTEM ${LIS_INCLUDE_DIR})
-endif()
-
-if(OGS_USE_MKL)
-    include_directories(SYSTEM ${MKL_INCLUDE_DIR})
-endif()
 
 # Eigen
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
diff --git a/MathLib/CMakeLists.txt b/MathLib/CMakeLists.txt
index bcfdca3cfc83e077ac69010928cff8a9f9750974..a6417a29849b64245a3a31ae43e45e70f0eb8a52 100644
--- a/MathLib/CMakeLists.txt
+++ b/MathLib/CMakeLists.txt
@@ -43,7 +43,11 @@ target_link_libraries(
 if(OGS_USE_PETSC)
     target_link_libraries(MathLib PUBLIC ${PETSC_LIBRARIES})
 endif()
+if(OGS_USE_LIS)
+    target_include_directories(MathLib PUBLIC ${LIS_INCLUDE_DIR})
+endif()
 if(OGS_USE_MKL)
+    target_include_directories(MathLib PRIVATE ${MKL_INCLUDE_DIR})
     target_link_libraries(MathLib PUBLIC ${MKL_LIBRARIES})
 endif()