diff --git a/BlueBerry/Bundles/org.blueberry.core.runtime/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.core.runtime/CMakeLists.txt
index 32f6774ed7..f2597a4a60 100644
--- a/BlueBerry/Bundles/org.blueberry.core.runtime/CMakeLists.txt
+++ b/BlueBerry/Bundles/org.blueberry.core.runtime/CMakeLists.txt
@@ -1,45 +1,45 @@
 project(org_blueberry_core_runtime)
 
 set(QT_USE_QTXML 1)
 
 MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE org_blueberry_core_runtime_EXPORT
-                        EXPORTED_INCLUDE_SUFFIXES src src/application src/service src/registry)
+                        EXPORTED_INCLUDE_SUFFIXES src src/application src/registry)
 
 target_link_libraries(${PLUGIN_TARGET} PUBLIC Poco::Foundation Poco::Util Poco::XML)
 if(MITK_USE_Qt5)
   target_link_libraries(${PLUGIN_TARGET} PRIVATE Qt5::Gui Qt5::Xml)
 endif()
 
 # Set compiler flags
 target_compile_definitions(${PLUGIN_TARGET} PUBLIC "$<$<PLATFORM_ID:Windows>:POCO_NO_UNWINDOWS;WIN32_LEAN_AND_MEAN>")
 
 add_executable(${OSGI_APP} MACOSX_BUNDLE "src/application/berryMain.cpp")
 
 target_link_libraries(${OSGI_APP} PRIVATE ${PROJECT_NAME} mbilog)
 if(_ctk_test_plugins)
   add_dependencies(${OSGI_APP} ${_ctk_test_plugins})
   add_dependencies(BlueBerry ${OSGI_APP})
   set_property(TARGET ${OSGI_APP} APPEND PROPERTY LABELS BlueBerry)
 endif()
 
 configure_file(src/application/solstice.ini
                ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_APP}.ini)
 
 
 add_executable(${OSGI_UI_APP} MACOSX_BUNDLE "src/application/berryMainUI.cpp")
 
 target_link_libraries(${OSGI_UI_APP} PRIVATE ${PROJECT_NAME} mbilog)
 if(MITK_USE_Qt5)
   target_link_libraries(${OSGI_UI_APP} PRIVATE Qt5::Widgets)
 endif()
 
 if(_ctk_test_plugins)
   add_dependencies(${OSGI_UI_APP} ${_ctk_test_plugins})
   add_dependencies(BlueBerry ${OSGI_UI_APP})
   set_property(TARGET ${OSGI_UI_APP} APPEND PROPERTY LABELS BlueBerry)
 endif()
 
 configure_file(src/application/solstice.ini
                ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OSGI_UI_APP}.ini)
 
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/berryConfig.h.in" "${CMAKE_CURRENT_BINARY_DIR}/berryConfig.h" @ONLY)
diff --git a/BlueBerry/Bundles/org.blueberry.ui.qt/CMakeLists.txt b/BlueBerry/Bundles/org.blueberry.ui.qt/CMakeLists.txt
index ce65027ab0..918d7a02fc 100644
--- a/BlueBerry/Bundles/org.blueberry.ui.qt/CMakeLists.txt
+++ b/BlueBerry/Bundles/org.blueberry.ui.qt/CMakeLists.txt
@@ -1,24 +1,23 @@
 project(org_blueberry_ui_qt)
 
 set(PLUGIN_exported_include_suffixes
   src
   src/actions
   src/application
   src/commands
-  src/dialogs
   src/guitk
   src/handlers
   src/intro
   src/presentations
   src/services
   src/testing
   src/tweaklets
   src/util
 )
 
 MACRO_CREATE_CTK_PLUGIN(EXPORT_DIRECTIVE BERRY_UI_QT
                         EXPORTED_INCLUDE_SUFFIXES ${PLUGIN_exported_include_suffixes})
 
 if(MITK_USE_Qt5)
   target_link_libraries(${PLUGIN_TARGET} PUBLIC Qt5::Widgets)
 endif()