diff --git a/thumbnail/CMakeLists.txt b/thumbnail/CMakeLists.txt
index 0926b387..2b1d8b9a 100644
--- a/thumbnail/CMakeLists.txt
+++ b/thumbnail/CMakeLists.txt
@@ -1,250 +1,248 @@
 add_definitions(-DTRANSLATION_DOMAIN=\"kio5_thumbnail\")
 
 find_package(OpenEXR)
 set_package_properties(OpenEXR PROPERTIES DESCRIPTION "API for accessing OpenEXR formatted images"
                        URL "http://www.openexr.com"
                        TYPE OPTIONAL
                        PURPOSE "Provides support for OpenEXR formatted images in the thumbnail kioslave"
                       )
 
 include_directories(${CMAKE_BINARY_DIR})
 
 ########### next target ###############
 
 set(kio_thumbnail_PART_SRCS thumbnail.cpp imagefilter.cpp)
 
 add_library(kio_thumbnail MODULE ${kio_thumbnail_PART_SRCS})
 
 target_link_libraries(kio_thumbnail
 	KF5::CoreAddons
 	KF5::KIOCore
 	KF5::KIOWidgets
 	KF5::Solid
 	KF5::IconThemes
  	KF5::I18n
 )
 
 set_target_properties(kio_thumbnail PROPERTIES OUTPUT_NAME "thumbnail")
 
 install(TARGETS kio_thumbnail DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio)
 
 ########### next target ###############
 
 set(imagethumbnail_PART_SRCS imagecreator.cpp)
 
 add_library(imagethumbnail MODULE ${imagethumbnail_PART_SRCS})
 
 target_link_libraries(imagethumbnail
     KF5::KIOWidgets
 )
 
 install(TARGETS imagethumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### next target ###############
 
 install( FILES directorythumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 
 ########### next target ###############
 
 set(jpegthumbnail_PART_SRCS jpegcreator.cpp)
 kconfig_add_kcfg_files(jpegthumbnail_PART_SRCS jpegcreatorsettings5.kcfgc)
 add_library(jpegthumbnail MODULE ${jpegthumbnail_PART_SRCS})
 
 target_link_libraries(jpegthumbnail
 	Qt5::Core
 	Qt5::Gui
 	KF5::KIOCore
 	KF5::KIOWidgets
 	KF5::I18n
 	KF5::ConfigCore
 	KF5::ConfigGui
 )
 
 install(FILES jpegcreatorsettings5.kcfg DESTINATION ${KCFG_INSTALL_DIR})
 install(TARGETS jpegthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### next target ###############
 
 set(svgthumbnail_PART_SRCS svgcreator.cpp)
 
 add_library(svgthumbnail MODULE ${svgthumbnail_PART_SRCS})
 
 target_link_libraries(svgthumbnail
 	Qt5::Gui
 	Qt5::Svg
 	KF5::KIOCore
 	KF5::KIOWidgets
 )
 
 install(TARGETS svgthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### next target ###############
 
 set(textthumbnail_PART_SRCS textcreator.cpp)
 
 add_library(textthumbnail MODULE ${textthumbnail_PART_SRCS})
 
 target_link_libraries(textthumbnail
     Qt5::Gui
     KF5::KIOWidgets
 )
 
 install(TARGETS textthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ############ next target ###############
 
 find_package(Qt5WebEngineWidgets 5.7.0 QUIET)
 set_package_properties(Qt5WebEngineWidgets PROPERTIES
                        TYPE OPTIONAL
                        PURPOSE "Provides support for HTML previews in the thumbnail ioslave"
                       )
 
 if (Qt5WebEngineWidgets_FOUND)
 
     set(htmlthumbnail_PART_SRCS htmlcreator.cpp)
 
     add_library(htmlthumbnail MODULE ${htmlthumbnail_PART_SRCS})
 
     target_link_libraries(htmlthumbnail Qt5::Core Qt5::WebEngineWidgets KF5::KIOWidgets)
 
     install(TARGETS htmlthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
 
 endif()
 ########### next target ###############
 
 if(NOT WIN32)
 set(djvuthumbnail_PART_SRCS djvucreator.cpp)
 
 add_library(djvuthumbnail MODULE ${djvuthumbnail_PART_SRCS})
 
 target_link_libraries(djvuthumbnail KF5::KIOWidgets)
 
 install(TARGETS djvuthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES djvuthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 
 endif()
 
 ########### next target ###############
 
 if(OpenEXR_FOUND)
 
-    include_directories( ${OpenEXR_INCLUDE_DIRS})
-
     set(exrthumbnail_PART_SRCS exrcreator.cpp)
 
     add_library(exrthumbnail MODULE ${exrthumbnail_PART_SRCS})
-
     target_link_libraries(exrthumbnail
             KF5::KIOCore
             KF5::KIOWidgets
             ${OpenEXR_LIBRARIES}
-        )
+    )
+    target_include_directories(exrthumbnail SYSTEM PRIVATE ${OpenEXR_INCLUDE_DIRS})
 
     # OpenEXR headers use exceptions; at least clang refuses to build the target
     # when exceptions are not enabled.
     kde_source_files_enable_exceptions(exrcreator.cpp)
 
     install(TARGETS exrthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
     install( FILES exrthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 
 endif()
 
 ########### next target ###############
 
 # if(X11_Xcursor_FOUND)
 #
 #    set(cursorthumbnail_PART_SRCS cursorcreator.cpp)
 #
 #    add_library(cursorthumbnail MODULE ${cursorthumbnail_PART_SRCS})
 #
 #    target_link_libraries(cursorthumbnail ${X11_Xcursor_LIB} ${KIO_LIBRARIES})
 #
 #    install(TARGETS cursorthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
 #    install( FILES cursorthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 #
 # endif()
 #
 
 ########### next target ###############
 
 set ( windowsexethumbnail_SRCS windowsexecreator.cpp icoutils_common.cpp)
 set ( windowsimagethumbnail_SRCS windowsimagecreator.cpp icoutils_common.cpp)
 
 if(WIN32)
     set ( windowsexethumbnail_SRCS ${windowsexethumbnail_SRCS} icoutils_win.cpp )
     set ( windowsimagethumbnail_SRCS ${windowsimagethumbnail_SRCS} icoutils_win.cpp )
 else()
     set ( windowsexethumbnail_SRCS ${windowsexethumbnail_SRCS} icoutils_wrestool.cpp )
     set ( windowsimagethumbnail_SRCS ${windowsimagethumbnail_SRCS} icoutils_wrestool.cpp )
 endif()
 
 add_library(windowsexethumbnail MODULE ${windowsexethumbnail_SRCS} )
 target_link_libraries ( windowsexethumbnail KF5::KIOWidgets )
 install ( TARGETS windowsexethumbnail DESTINATION ${PLUGIN_INSTALL_DIR} )
 install ( FILES windowsexethumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 add_library(windowsimagethumbnail MODULE ${windowsimagethumbnail_SRCS} )
 target_link_libraries ( windowsimagethumbnail KF5::KIOWidgets )
 install ( TARGETS windowsimagethumbnail DESTINATION ${PLUGIN_INSTALL_DIR} )
 install ( FILES windowsimagethumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 ########### next target ###############
 
 set(comicbookthumbnail_SRCS comiccreator.cpp)
 add_library(comicbookthumbnail MODULE ${comicbookthumbnail_SRCS})
 target_link_libraries(comicbookthumbnail
     Qt5::Gui
     KF5::Archive
     KF5::KIOWidgets
 )
 if (UNIX)
     target_link_libraries(comicbookthumbnail KF5::Pty)
 endif ()
 install(TARGETS comicbookthumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
 
 # ########### next target ###############
 
 set(kritathumbnail_SRCS kritacreator.cpp)
 add_library(kritathumbnail MODULE ${kritathumbnail_SRCS})
 
 target_link_libraries(kritathumbnail
     KF5::KIOWidgets
     KF5::Archive
     Qt5::Gui
 )
 
 install(TARGETS kritathumbnail  DESTINATION ${PLUGIN_INSTALL_DIR})
 
 ########### next target #################
 
 find_package(Taglib 1.11)
 
 if(TAGLIB_FOUND)
     set(audiothumbnail_SRCS audiocreator.cpp)
     add_library(audiothumbnail MODULE ${audiothumbnail_SRCS})
     target_include_directories(audiothumbnail BEFORE PRIVATE ${TAGLIB_INCLUDES})
     target_link_libraries(audiothumbnail ${TAGLIB_LIBRARIES} KF5::KIOWidgets)
     install(TARGETS audiothumbnail DESTINATION ${PLUGIN_INSTALL_DIR})
     set(audiothumbnail_desktop audiothumbnail.desktop)
 endif(TAGLIB_FOUND)
 
 ########### install files ###############
 
 install(FILES thumbcreator.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
 install(FILES
     thumbnail.protocol
     svgthumbnail.desktop
     imagethumbnail.desktop
     jpegthumbnail.desktop
     textthumbnail.desktop
 #    desktopthumbnail.desktop
     comicbookthumbnail.desktop
     kraorathumbnail.desktop
     ${audiothumbnail_desktop}
     DESTINATION ${SERVICES_INSTALL_DIR})
 
 if (Qt5WebEngineWidgets_FOUND)
    install(FILES htmlthumbnail.desktop DESTINATION ${SERVICES_INSTALL_DIR})
 
 endif()