diff --git a/applets/kimpanel/backend/ibus/CMakeLists.txt b/applets/kimpanel/backend/ibus/CMakeLists.txt
index 48b72b7ef..10debba6d 100644
--- a/applets/kimpanel/backend/ibus/CMakeLists.txt
+++ b/applets/kimpanel/backend/ibus/CMakeLists.txt
@@ -1,46 +1,45 @@
 find_package(IBus 1.5.0)
 find_package(GLIB2)
 find_package(GIO)
 find_package(GObject)
 
 if(IBUS_FOUND AND GLIB2_FOUND AND GIO_FOUND AND GOBJECT_FOUND)
     configure_file(config-kimpanel.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kimpanel.h)
     include_directories(${IBUS_INCLUDE_DIR})
     include_directories(${GIO_INCLUDE_DIR})
     include_directories(${GOBJECT_INCLUDE_DIR})
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
 
     find_package(Qt5X11Extras)
     find_package(XCB COMPONENTS XCB KEYSYMS)
 
     add_subdirectory(emojier)
 
     if (Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND)
-        include_directories(${Qt5X11Extras_INCLUDE_DIRS})
         include_directories(${XCB_XCB_INCLUDE_DIRS})
         include_directories(${XCB_KEYSYMS_INCLUDE_DIRS})
         set(kimpanel_ibus_panel_SRCS
             ibus15/xkblayoutmanager.cpp
             ibus15/gtkaccelparse_p.c
             ibus15/gdkkeynames_p.c
             ibus15/app.cpp
             ibus15/enginemanager.cpp
             ibus15/main.cpp
             ibus15/panel.cpp
             ibus15/propertymanager.cpp)
         add_definitions(-DQT_NO_KEYWORDS)
         add_executable(kimpanel-ibus-panel ${kimpanel_ibus_panel_SRCS})
         target_link_libraries(kimpanel-ibus-panel ${IBUS_LIBRARIES} GLIB2::GLIB2 ${GIO_LIBRARIES} ${GOBJECT_LIBRARIES} Qt5::Core Qt5::DBus Qt5::Gui Qt5::X11Extras XCB::KEYSYMS)
         # configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kimpanel.xml.in ${CMAKE_CURRENT_BINARY_DIR}/kimpanel.xml @ONLY)
         # install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kimpanel.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ibus/component)
 
         target_include_directories(kimpanel-ibus-panel PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
         add_executable(kimpanel-ibus-panel-launcher launcher.cpp)
         set_target_properties(kimpanel-ibus-panel-launcher PROPERTIES AUTOMOC TRUE)
         target_link_libraries(kimpanel-ibus-panel-launcher Qt5::Core Qt5::DBus)
         target_include_directories(kimpanel-ibus-panel-launcher PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
         install(TARGETS kimpanel-ibus-panel kimpanel-ibus-panel-launcher DESTINATION ${KDE_INSTALL_LIBEXECDIR})
     endif()
 endif()
 
diff --git a/dataengines/kimpanel/CMakeLists.txt b/dataengines/kimpanel/CMakeLists.txt
index 299b2b95e..b66f89f0d 100644
--- a/dataengines/kimpanel/CMakeLists.txt
+++ b/dataengines/kimpanel/CMakeLists.txt
@@ -1,35 +1,34 @@
 add_definitions(-DTRANSLATION_DOMAIN="plasma_engine_kimpanel")
 
 configure_file(config-kimpanel.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kimpanel.h)
 
 set(plasma_engine_kimpanel_SRCS
     kimpaneldataengine.cpp
     kimpanelagent.cpp
     kimpanelservice.cpp
     kimpaneljob.cpp
     kimpanelinputpanelcontainer.cpp
     kimpanelstatusbarcontainer.cpp
 )
 QT5_ADD_DBUS_ADAPTOR(plasma_engine_kimpanel_SRCS
     org.kde.impanel.xml
     kimpanelagent.h
     PanelAgent)
 
 
 add_library(plasma_engine_kimpanel ${plasma_engine_kimpanel_SRCS})
 target_include_directories(plasma_engine_kimpanel PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 set_target_properties(plasma_engine_kimpanel PROPERTIES PREFIX "")
 target_link_libraries(plasma_engine_kimpanel
 	KF5::Plasma
-	KF5::Service
 	Qt5::DBus
 )
 kcoreaddons_desktop_to_json(plasma_engine_kimpanel plasma-dataengine-kimpanel.desktop)
 
 install(TARGETS plasma_engine_kimpanel
         DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine)
 
 install(FILES plasma-dataengine-kimpanel.desktop
         DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
 install(FILES kimpanel.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services)