diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 65a47f9..811a5fb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,142 +1,145 @@
 
 set(kguiaddons_LIB_SRCS
  colors/kcolorspaces.cpp
  colors/kcolorutils.cpp
  colors/kcolorcollection.cpp
  colors/kcolormimedata.cpp
  text/kdatevalidator.cpp
  text/kwordwrap.cpp
  fonts/kfontutils.cpp
  util/kiconutils.cpp
  util/klocalimagecacheimpl.cpp
  util/kmodifierkeyinfo.cpp
  util/kmodifierkeyinfoprovider.cpp
  util/urlhandler.cpp
 )
 
 set (kguiaddons_LIB_SRCS ${kguiaddons_LIB_SRCS} util/kmodifierkeyinfoprovider.cpp)
 
 add_library(KF5GuiAddons ${kguiaddons_LIB_SRCS})
 
 generate_export_header(KF5GuiAddons BASE_NAME KGuiAddons)
 add_library(KF5::GuiAddons ALIAS KF5GuiAddons)
 
 set(kguiaddons_INCLUDES
   ${CMAKE_CURRENT_SOURCE_DIR}/colors
   ${CMAKE_CURRENT_SOURCE_DIR}/fonts
   ${CMAKE_CURRENT_SOURCE_DIR}/text
   ${CMAKE_CURRENT_SOURCE_DIR}/util
   )
 target_include_directories(KF5GuiAddons PUBLIC "$<BUILD_INTERFACE:${kguiaddons_INCLUDES}>")
 target_include_directories(KF5GuiAddons INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KGuiAddons>" )
 target_compile_definitions(KF5GuiAddons INTERFACE "$<INSTALL_INTERFACE:KGUIADDONS_LIB>")
 target_link_libraries(KF5GuiAddons PUBLIC Qt5::Gui)
 
 set(WITH_XCB)
 if (NOT APPLE AND X11_FOUND AND X11_Xkb_FOUND AND XCB_XCB_FOUND)
     find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE)
     if (Qt5X11Extras_FOUND)
         add_library(kmodifierkey_xcb MODULE util/kmodifierkeyinfoprovider_xcb.cpp)
         target_include_directories (kmodifierkey_xcb PRIVATE
             ${X11_Xkb_INCLUDE_PATH}
             ${X11_Xlib_INCLUDE_PATH}
             ${XCB_XCB_INCLUDE_DIR}
         )
         target_link_libraries(kmodifierkey_xcb PRIVATE ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} Qt5::X11Extras KF5::GuiAddons)
         install( TARGETS kmodifierkey_xcb DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kguiaddons/kmodifierkey/)
     endif()
 endif ()
 
 set_target_properties(KF5GuiAddons PROPERTIES VERSION   ${KGUIADDONS_VERSION_STRING}
                                               SOVERSION ${KGUIADDONS_SOVERSION}
                                               EXPORT_NAME GuiAddons
 )
 
 ecm_generate_headers(KGuiAddons_HEADERS
   HEADER_NAMES
   KColorUtils
   KColorCollection
   KColorMimeData
 
   RELATIVE colors
   REQUIRED_HEADERS KGuiAddons_HEADERS
 )
 ecm_generate_headers(KGuiAddons_HEADERS
   HEADER_NAMES
   KDateValidator
   KWordWrap
 
   RELATIVE text
   REQUIRED_HEADERS KGuiAddons_HEADERS
 )
 ecm_generate_headers(KGuiAddons_HEADERS
   HEADER_NAMES
   KFontUtils
 
   RELATIVE fonts
   REQUIRED_HEADERS KGuiAddons_HEADERS
 )
 ecm_generate_headers(KGuiAddons_HEADERS
   HEADER_NAMES
   KIconUtils
   KImageCache
   KModifierKeyInfo
 
   RELATIVE util
   REQUIRED_HEADERS KGuiAddons_HEADERS
 )
 
 find_package(PythonModuleGeneration)
 
 if (PythonModuleGeneration_FOUND)
   ecm_generate_python_binding(
     TARGET KF5::GuiAddons
     PYTHONNAMESPACE PyKF5
     MODULENAME KGuiAddons
     SIP_DEPENDS
       QtGui/QtGuimod.sip
     HEADERS
       colors/kcolorutils.h
       colors/kcolorcollection.h
       colors/kcolormimedata.h
       text/kdatevalidator.h
       text/kwordwrap.h
       fonts/kfontutils.h
       util/kiconutils.h
       util/kimagecache.h
       util/kmodifierkeyinfo.h
   )
 endif()
 
 install(TARGETS KF5GuiAddons EXPORT KF5GuiAddonsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/kguiaddons_export.h
   util/kmodifierkeyinfoprovider_p.h
   util/klocalimagecacheimpl.h # implementation detail, no forwarding header
   ${KGuiAddons_HEADERS}
   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KGuiAddons COMPONENT Devel
 )
 
 if(BUILD_QCH)
     ecm_add_qch(
         KF5GuiAddons_QCH
         NAME KGuiAddons
         BASE_NAME KF5GuiAddons
         VERSION ${KF5_VERSION}
         ORG_DOMAIN org.kde
         SOURCES # using only public headers, to cover only public API
             ${KGuiAddons_HEADERS}
         MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
         LINK_QCHS
             Qt5Gui_QCH
+        INCLUDE_DIRS
+            ${CMAKE_CURRENT_BINARY_DIR}
+            ${kguiaddons_INCLUDES}
         BLANK_MACROS
             KGUIADDONS_EXPORT
         TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
         QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
         COMPONENT Devel
     )
 endif()
 
 include(ECMGeneratePriFile)
 ecm_generate_pri_file(BASE_NAME KGuiAddons LIB_NAME KF5GuiAddons DEPS "gui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KGuiAddons)
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})