diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5e070e4..4667436 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,37 +1,40 @@
 add_subdirectory(core)
 if(TARGET Qt5::Gui)
     add_subdirectory(gui)
 endif()
 add_subdirectory(kconfig_compiler)
 add_subdirectory(kconf_update)
 add_subdirectory(kreadconfig)
 
 if (BUILD_QCH)
     ecm_add_qch(
         KF5Config_QCH
         NAME KConfig
         BASE_NAME KF5Config
         VERSION ${KF5_VERSION}
         ORG_DOMAIN org.kde
         SOURCES # using only public headers, to cover only public API
             ${KConfigCore_APIDOX_SRCS}
             ${KConfigGui_APIDOX_SRCS}
             "${CMAKE_CURRENT_SOURCE_DIR}/kconfig_compiler/README.dox"
             "${CMAKE_SOURCE_DIR}/docs/options.md"
         MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
         LINK_QCHS
             Qt5Core_QCH
             Qt5Xml_QCH
             Qt5Gui_QCH
+        INCLUDE_DIRS
+            ${KConfigCore_APIDOX_INCLUDE_DIRS}
+            ${KConfigGui_APIDOX_INCLUDE_DIRS}
         BLANK_MACROS
             KCONFIGCORE_EXPORT
             KCONFIGCORE_DEPRECATED_EXPORT
             KCONFIGCORE_DEPRECATED
             KCONFIGGUI_EXPORT
             KCONFIGGUI_DEPRECATED_EXPORT
             KCONFIGGUI_DEPRECATED
         TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
         QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
         COMPONENT Devel
     )
 endif()
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 2fa8087..45f2147 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,102 +1,103 @@
 set(libkconfigcore_SRCS
    kconfig.cpp
    kconfigbase.cpp
    kconfigdata.cpp
    kconfiggroup.cpp
    kconfigbackend.cpp
    kconfigini.cpp
    kdesktopfile.cpp
    ksharedconfig.cpp
    kcoreconfigskeleton.cpp
    kauthorized.cpp
    kemailsettings.cpp
    kconfigwatcher.cpp
 )
 
 ecm_qt_declare_logging_category(libkconfigcore_SRCS
                                 HEADER kconfig_core_log_settings.h
                                 IDENTIFIER KCONFIG_CORE_LOG
                                 CATEGORY_NAME kf5.kconfig.core)
 
 configure_file(config-kconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kconfig.h )
 
 add_library(KF5ConfigCore ${libkconfigcore_SRCS})
 generate_export_header(KF5ConfigCore BASE_NAME KConfigCore)
 add_library(KF5::ConfigCore ALIAS KF5ConfigCore)
 
 target_compile_definitions(KF5ConfigCore
     PRIVATE
         KCONF_UPDATE_INSTALL_LOCATION="${KDE_INSTALL_FULL_LIBEXECDIR_KF5}/$<TARGET_FILE_NAME:KF5::kconf_update>"
 )
 
 target_include_directories(KF5ConfigCore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigCore>")
 
 target_link_libraries(KF5ConfigCore PUBLIC Qt5::Core)
 
 if(KCONFIG_USE_DBUS)
     target_link_libraries(KF5ConfigCore PRIVATE Qt5::DBus)
 endif()
 
 if(WIN32)
     target_link_libraries(KF5ConfigCore PRIVATE ${KDEWIN_LIBRARIES})
 endif()
 
 set_target_properties(KF5ConfigCore PROPERTIES VERSION   ${KCONFIG_VERSION_STRING}
                                                SOVERSION ${KCONFIG_SOVERSION}
                                                EXPORT_NAME ConfigCore
 )
 
 ecm_generate_headers(KConfigCore_HEADERS
   HEADER_NAMES
   KAuthorized
   KConfig
   KConfigBase
   KConfigGroup
   KDesktopFile
   KSharedConfig
   KCoreConfigSkeleton
   KEMailSettings
   ConversionCheck
   KConfigWatcher
 
   REQUIRED_HEADERS KConfigCore_HEADERS
 )
 
 find_package(PythonModuleGeneration)
 
 if (PythonModuleGeneration_FOUND)
   ecm_generate_python_binding(
     TARGET KF5::ConfigCore
     PYTHONNAMESPACE PyKF5
     MODULENAME KConfigCore
     RULES_FILE "${CMAKE_SOURCE_DIR}/cmake/rules_PyKF5.py"
     SIP_DEPENDS
       QtCore/QtCoremod.sip
     HEADERS
       kauthorized.h
       kconfig.h
       kconfigbase.h
       kconfiggroup.h
       kdesktopfile.h
       ksharedconfig.h
       kcoreconfigskeleton.h
       kemailsettings.h
       conversioncheck.h
       kconfigwatcher.h
   )
 endif()
 
 install(TARGETS KF5ConfigCore EXPORT KF5ConfigTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/kconfigcore_export.h
   ${KConfigCore_HEADERS}
   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigCore COMPONENT Devel
 )
 
 # make available to ecm_add_qch in parent folder
 set(KConfigCore_APIDOX_SRCS ${KConfigCore_HEADERS} PARENT_SCOPE)
+set(KConfigCore_APIDOX_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
 
 include(ECMGeneratePriFile)
 ecm_generate_pri_file(BASE_NAME KConfigCore LIB_NAME KF5ConfigCore DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigCore)
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index d36f90f..6ae7729 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -1,70 +1,71 @@
 set(libkconfiggui_SRCS
    kconfiggui.cpp
    kconfiggroupgui.cpp
    kconfigloader.cpp
    kconfigskeleton.cpp
    kstandardshortcut.cpp
    kwindowconfig.cpp
 )
 ecm_create_qm_loader(libkconfiggui_SRCS kconfig5_qt)
 
 add_library(KF5ConfigGui ${libkconfiggui_SRCS})
 generate_export_header(KF5ConfigGui BASE_NAME KConfigGui)
 add_library(KF5::ConfigGui ALIAS KF5ConfigGui)
 
 target_include_directories(KF5ConfigGui INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigGui>")
 
 target_link_libraries(KF5ConfigGui PUBLIC Qt5::Gui Qt5::Xml KF5::ConfigCore)
 
 set_target_properties(KF5ConfigGui PROPERTIES VERSION   ${KCONFIG_VERSION_STRING}
                                               SOVERSION ${KCONFIG_SOVERSION}
                                               EXPORT_NAME ConfigGui
 )
 
 ecm_generate_headers(KConfigGui_HEADERS
   HEADER_NAMES
   KConfigGui
   KConfigLoader
   KConfigSkeleton
   KStandardShortcut
   KWindowConfig
 
    REQUIRED_HEADERS KConfigGui_HEADERS
 )
 
 find_package(PythonModuleGeneration)
 
 if (PythonModuleGeneration_FOUND)
   ecm_generate_python_binding(
     TARGET KF5::ConfigGui
     PYTHONNAMESPACE PyKF5
     MODULENAME KConfigGui
     RULES_FILE "${CMAKE_SOURCE_DIR}/cmake/rules_PyKF5.py"
     SIP_INCLUDES
       "${CMAKE_BINARY_DIR}/src/core/sip"
     SIP_DEPENDS
       QtGui/QtGuimod.sip
       PyKF5/KConfigCore/KConfigCoremod.sip
     HEADERS
       kconfiggui.h
       kconfigloader.h
       kconfigskeleton.h
       kstandardshortcut.h
       kwindowconfig.h
   )
 endif()
 
 install(TARGETS KF5ConfigGui EXPORT KF5ConfigTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 
 install(FILES
   ${CMAKE_CURRENT_BINARY_DIR}/kconfiggui_export.h
   ${KConfigGui_HEADERS}
   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigGui COMPONENT Devel
 )
 
 # make available to ecm_add_qch in parent folder
 set(KConfigGui_APIDOX_SRCS ${KConfigGui_HEADERS} PARENT_SCOPE)
+set(KConfigGui_APIDOX_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE)
 
 include(ECMGeneratePriFile)
 ecm_generate_pri_file(BASE_NAME KConfigGui LIB_NAME KF5ConfigGui DEPS "gui xml KConfigCore" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigGui)
 install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})