diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
--- a/libs/image/CMakeLists.txt
+++ b/libs/image/CMakeLists.txt
@@ -25,7 +25,7 @@
 )
 
 if(FFTW3_FOUND)
-  include_directories(SYSTEM ${FFTW3_INCLUDE_DIR})
+  include_directories(${FFTW3_INCLUDE_DIR})
 endif()
 
 if(HAVE_VC)
diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
--- a/libs/ui/CMakeLists.txt
+++ b/libs/ui/CMakeLists.txt
@@ -8,10 +8,10 @@
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/qtlockedfile
+    ${EXIV2_INCLUDE_DIR}
 )
 
 include_directories(SYSTEM
-    ${EXIV2_INCLUDE_DIR}
     ${EIGEN3_INCLUDE_DIR}
     ${OCIO_INCLUDE_DIR}
     ${Boost_INCLUDE_DIRS}
diff --git a/plugins/extensions/gmic/CMakeLists.txt b/plugins/extensions/gmic/CMakeLists.txt
--- a/plugins/extensions/gmic/CMakeLists.txt
+++ b/plugins/extensions/gmic/CMakeLists.txt
@@ -59,7 +59,7 @@
     message("G'Mic: using FFTW3")
     add_definitions(-Dcimg_use_fftw3 )
     add_definitions(-Dcimg_use_fftw3_singlethread )
-    include_directories(SYSTEM ${FFTW3_INCLUDE_DIR})
+    include_directories(${FFTW3_INCLUDE_DIR})
 endif()
 
 # PNG
diff --git a/plugins/impex/jpeg/CMakeLists.txt b/plugins/impex/jpeg/CMakeLists.txt
--- a/plugins/impex/jpeg/CMakeLists.txt
+++ b/plugins/impex/jpeg/CMakeLists.txt
@@ -2,11 +2,13 @@
 
 set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
 
-include_directories(${ICCJPEG_SOURCE_DIR})
+include_directories(
+    ${ICCJPEG_SOURCE_DIR}
+    ${EXIV2_INCLUDE_DIR}
+)
 
 include_directories(SYSTEM
     ${LCMS2_INCLUDE_DIR}
-    ${EXIV2_INCLUDE_DIR}
 )
 
 set(libkritaconverter_LIB_SRCS