diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c332259c425be2531a3d483d1c9cfc432da047c..2c29e6ef67afe19404f82d8c6686328df71ad838 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,6 +117,7 @@ INCLUDE_DIRECTORIES( SYSTEM ${CMAKE_CURRENT_BINARY_DIR}/ThirdParty/zlib )
 
 IF(OGS_USE_LIS)
     ADD_DEFINITIONS(-DUSE_LIS)
+    INCLUDE_DIRECTORIES(SYSTEM ${LIS_INCLUDE_DIR})
 ENDIF()
 
 IF(OGS_USE_PETSC)
@@ -135,6 +136,7 @@ IF(OGS_USE_EIGEN)
 	IF (EIGEN_NO_DEBUG)
 		ADD_DEFINITIONS(-DEIGEN_NO_DEBUG)
 	ENDIF()
+	INCLUDE_DIRECTORIES (SYSTEM ${EIGEN3_INCLUDE_DIR})
 ENDIF()
 
 ADD_SUBDIRECTORY( Applications )
diff --git a/MathLib/CMakeLists.txt b/MathLib/CMakeLists.txt
index 1bbe93c06e53d3a9e4fa729cd8b1005588d8550f..a795591b84632532ffcca864667cfc01624d1eb5 100644
--- a/MathLib/CMakeLists.txt
+++ b/MathLib/CMakeLists.txt
@@ -53,10 +53,6 @@ IF(METIS_FOUND)
 	)
 ENDIF()
 
-IF (LIS_FOUND)
-    INCLUDE_DIRECTORIES(${LIS_INCLUDE_DIR})
-ENDIF()
-
 IF (OGS_USE_PETSC)
     INCLUDE_DIRECTORIES ( LinAlg/PETSc )   
 
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8cb3496de74d020cc6f882cf9d7c961890fc7e3b..1c1fe607d082b37e9277afb4188b1955c089b35c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -28,14 +28,6 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_BINARY_DIR}/BaseLib
 )
 
-IF (LIS_FOUND)
-	INCLUDE_DIRECTORIES(${LIS_INCLUDE_DIR})
-ENDIF()
-
-IF (OGS_USE_EIGEN)
-	INCLUDE_DIRECTORIES (SYSTEM ${EIGEN3_INCLUDE_DIR})
-ENDIF()
-
 ADD_EXECUTABLE (testrunner testrunner.cpp ${TEST_SOURCES})
 SET_TARGET_PROPERTIES(testrunner PROPERTIES FOLDER Testing)
 IF(TARGET Eigen)