diff --git a/Applications/DataExplorer/CMakeLists.txt b/Applications/DataExplorer/CMakeLists.txt
index 41781bb03e5f9f40af894cb395903887cf9d74db..bdb1b2eec78310787187be4fcca3d52c5cb6cc90 100644
--- a/Applications/DataExplorer/CMakeLists.txt
+++ b/Applications/DataExplorer/CMakeLists.txt
@@ -1,3 +1,7 @@
+if(MSVC)
+	add_definitions(-DVTKGUISUPPORTQT_STATIC_DEFINE)
+endif()
+
 if(VTKFBXCONVERTER_FOUND)
 	add_definitions(-DVTKFBXCONVERTER_FOUND)
 	include_directories(${VTKFBXCONVERTER_INCLUDE_DIRS})
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index 6a1a7c861e4e57695928919da05725127ae8defc..8b8d1999ae8369e00c0dc5d9ad00215c99370ccc 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -141,7 +141,7 @@ endif()
 
 find_package(Shapelib)
 if(Shapelib_FOUND)
-	include_directories(${Shapelib_INCLUDE_DIRS})
+	include_directories(SYSTEM ${Shapelib_INCLUDE_DIRS})
 elseif(OGS_BUILD_GUI)
 	message(FATAL_ERROR "Shapelib not found but it is required for OGS_BUILD_GUI!")
 endif()