diff --git a/utilities/assistants/calendar/CMakeLists.txt b/utilities/assistants/calendar/CMakeLists.txt
index b581b681c6..287da8c6e9 100644
--- a/utilities/assistants/calendar/CMakeLists.txt
+++ b/utilities/assistants/calendar/CMakeLists.txt
@@ -1,44 +1,41 @@
 #
 # Copyright (c) 2010-2016, Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 if (POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif (POLICY CMP0063)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wizard
-                    ${CMAKE_CURRENT_SOURCE_DIR}/print
-
-                    $<TARGET_PROPERTY:Qt5::Widgets,INTERFACE_INCLUDE_DIRECTORIES>
+include_directories($<TARGET_PROPERTY:Qt5::Widgets,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Concurrent,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::PrintSupport,INTERFACE_INCLUDE_DIRECTORIES>
 
                     $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 if(KF5CalendarCore_FOUND)
     include_directories($<TARGET_PROPERTY:KF5::CalendarCore,INTERFACE_INCLUDE_DIRECTORIES>)
 endif()
 
 set(libcalendar_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/print/calsettings.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/print/calpainter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/print/calprinter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/print/calsystem.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/calintropage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/calmonthwidget.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/caltemplate.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/calwidget.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/calwizard.cpp
 )
 
 ki18n_wrap_ui(libcalendar_SRCS
-              ui/caltemplate.ui
-              ui/calevents.ui
-              ui/calprogress.ui
+              ${CMAKE_CURRENT_SOURCE_DIR}/ui/caltemplate.ui
+              ${CMAKE_CURRENT_SOURCE_DIR}/ui/calevents.ui
+              ${CMAKE_CURRENT_SOURCE_DIR}/ui/calprogress.ui
 )
 
 add_library(calendar_src OBJECT ${libcalendar_SRCS})
diff --git a/utilities/assistants/expoblending/CMakeLists.txt b/utilities/assistants/expoblending/CMakeLists.txt
index 5734c27d88..6fb3672eae 100644
--- a/utilities/assistants/expoblending/CMakeLists.txt
+++ b/utilities/assistants/expoblending/CMakeLists.txt
@@ -1,42 +1,38 @@
 #
 # Copyright (c) 2010-2017, Gilles Caulier, <caulier dot gilles at gmail dot com>
 # Copyright (c) 2015,      Benjamin Girault, <benjamin dot girault at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 if (POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif (POLICY CMP0063)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wizard
-                    ${CMAKE_CURRENT_SOURCE_DIR}/blendingdlg
-                    ${CMAKE_CURRENT_SOURCE_DIR}/manager
-
-                    $<TARGET_PROPERTY:Qt5::Widgets,INTERFACE_INCLUDE_DIRECTORIES>
+include_directories($<TARGET_PROPERTY:Qt5::Widgets,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Concurrent,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
 
                     $<TARGET_PROPERTY:KF5::XmlGui,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::ConfigCore,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::Service,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 set(libexpoblending_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/expoblendingmanager.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/expoblendingthread.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/enfusebinary.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/expoblendingwizard.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/expoblendingintropage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/expoblendingitemspage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/expoblendingpreprocesspage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/expoblendinglastpage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/blendingdlg/enfusesettings.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/blendingdlg/bracketstack.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/blendingdlg/enfusestack.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/blendingdlg/expoblendingdlg.cpp
 )
 
 
 add_library(expoblending_src OBJECT ${libexpoblending_SRCS})
diff --git a/utilities/assistants/htmlgallery/CMakeLists.txt b/utilities/assistants/htmlgallery/CMakeLists.txt
index c4cf47b43f..7b8e4da53f 100644
--- a/utilities/assistants/htmlgallery/CMakeLists.txt
+++ b/utilities/assistants/htmlgallery/CMakeLists.txt
@@ -1,58 +1,54 @@
 #
 # Copyright (c) 2010-2017, Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 if (POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif (POLICY CMP0063)
 
 include_directories($<TARGET_PROPERTY:Qt5::Widgets,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Concurrent,INTERFACE_INCLUDE_DIRECTORIES>
 
                     $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::ConfigCore,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::ConfigWidgets,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::XmlGui,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::Service,INTERFACE_INCLUDE_DIRECTORIES>
 
                     ${LIBXSLT_INCLUDE_DIR}
                     ${LIBXML2_INCLUDE_DIR}
-
-                    ${CMAKE_CURRENT_SOURCE_DIR}/parameters/
-                    ${CMAKE_CURRENT_SOURCE_DIR}/generator/
-                    ${CMAKE_CURRENT_SOURCE_DIR}/wizard/
 )
 
 add_definitions(${LIBXSLT_DEFINITIONS}
                 ${LIBXML2_DEFINITIONS}
 )
 
 set(libhtmlgallery_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/parameters/abstractthemeparameter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/parameters/intthemeparameter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/parameters/listthemeparameter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/parameters/stringthemeparameter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/parameters/colorthemeparameter.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/invisiblebuttongroup.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/htmlintropage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/htmlselectionpage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/htmlthemepage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/htmloutputpage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/htmlfinalpage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/htmlimagesettingspage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/htmlparameterspage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/htmlwizard.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/generator/galleryxmlutils.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/generator/gallerynamehelper.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/generator/galleryelementfunctor.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/generator/galleryconfig.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/generator/galleryelement.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/generator/gallerytheme.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/generator/galleryinfo.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/generator/gallerygenerator.cpp
 )
 
 add_library(htmlgallery_src OBJECT ${libhtmlgallery_SRCS})
diff --git a/utilities/assistants/panorama/CMakeLists.txt b/utilities/assistants/panorama/CMakeLists.txt
index e645380be3..1017e08d65 100644
--- a/utilities/assistants/panorama/CMakeLists.txt
+++ b/utilities/assistants/panorama/CMakeLists.txt
@@ -1,82 +1,74 @@
 #
 # Copyright (c) 2010-2017, Gilles Caulier, <caulier dot gilles at gmail dot com>
 # Copyright (c) 2011-2016, Benjamin Girault, <benjamin dot girault at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying PANO_COPYING-CMAKE-SCRIPTS file.
 
 if (POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif (POLICY CMP0063)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR}
-                    ${CMAKE_CURRENT_SOURCE_DIR}/wizard
-                    ${CMAKE_CURRENT_SOURCE_DIR}/manager
-                    ${CMAKE_CURRENT_SOURCE_DIR}/plugin
-                    ${CMAKE_CURRENT_SOURCE_DIR}/ptoparser
-                    ${CMAKE_CURRENT_SOURCE_DIR}/tasks
-                   )
-
 # =======================================================
 
 # Rules to prevent broken compilation or warnings with C code generated by Flex
 while(CMAKE_C_FLAGS MATCHES "-std=iso9899:1990")
     string(REPLACE "-std=iso9899:1990" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
 endwhile()
 
 if(NOT MSVC)
     set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/panoScanner.c PROPERTIES COMPILE_FLAGS "-Wno-unused-function")
 endif()
 
 FLEX_TARGET(PTOScanner ptoparser/panoScanner.l ${CMAKE_CURRENT_BINARY_DIR}/panoScanner.c)
 BISON_TARGET(PTOParser ptoparser/panoParser.y  ${CMAKE_CURRENT_BINARY_DIR}/panoParser.c)
 ADD_FLEX_BISON_DEPENDENCY(PTOScanner PTOParser)
 
 # =======================================================
 
 set(libpanorama_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/ptotype/ptotype.cpp
     ${FLEX_PTOScanner_OUTPUTS}
     ${BISON_PTOParser_OUTPUTS}
     ${CMAKE_CURRENT_SOURCE_DIR}/ptoparser/tparser.c
     ${CMAKE_CURRENT_SOURCE_DIR}/ptoparser/tparserprivate.c
     ${CMAKE_CURRENT_SOURCE_DIR}/ptoparser/tparsergetters.c
     ${CMAKE_CURRENT_SOURCE_DIR}/ptoparser/ptofile.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/panotask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/commandtask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/createfinalptotask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/cpfindtask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/cpcleantask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/optimisationtask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/autocroptask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/createmktask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/compilemksteptask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/compilemktask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/huginexecutortask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/copyfilestask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/createpreviewtask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/createptotask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/tasks/preprocesstask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/cpfindbinary.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/panoactionthread.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/panomanager.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/panointropage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/panoitemspage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/panolastpage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/panooptimizepage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/panopreprocesspage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/panopreviewpage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/panowizard.cpp
 )
 
 include_directories($<TARGET_PROPERTY:Qt5::Widgets,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Concurrent,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
 
                     $<TARGET_PROPERTY:KF5::XmlGui,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::ConfigCore,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::ThreadWeaver,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 add_library(panorama_src OBJECT ${libpanorama_SRCS})
diff --git a/utilities/assistants/sendbymail/CMakeLists.txt b/utilities/assistants/sendbymail/CMakeLists.txt
index 6b0a442c05..2da2c03f47 100644
--- a/utilities/assistants/sendbymail/CMakeLists.txt
+++ b/utilities/assistants/sendbymail/CMakeLists.txt
@@ -1,36 +1,33 @@
 #
 # Copyright (c) 2010-2017, Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 if (POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif (POLICY CMP0063)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/wizard
-                    ${CMAKE_CURRENT_SOURCE_DIR}/manager
-
-                    $<TARGET_PROPERTY:Qt5::Widgets,INTERFACE_INCLUDE_DIRECTORIES>
+include_directories($<TARGET_PROPERTY:Qt5::Widgets,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Concurrent,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
 
                     $<TARGET_PROPERTY:KF5::XmlGui,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::ConfigCore,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
 )
 
 set(libsendbymail_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/imageresizethread.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/imageresizejob.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/mailsettings.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/mailprocess.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/mailwizard.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/mailintropage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/mailalbumspage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/mailimagespage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/mailsettingspage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/mailfinalpage.cpp
 )
 
 add_library(sendbymail_src OBJECT ${libsendbymail_SRCS})
diff --git a/utilities/assistants/videoslideshow/CMakeLists.txt b/utilities/assistants/videoslideshow/CMakeLists.txt
index 0c530c28c4..aaf53f501f 100644
--- a/utilities/assistants/videoslideshow/CMakeLists.txt
+++ b/utilities/assistants/videoslideshow/CMakeLists.txt
@@ -1,37 +1,34 @@
 #
 # Copyright (c) 2010-2017, Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 if (POLICY CMP0063)
     cmake_policy(SET CMP0063 NEW)
 endif (POLICY CMP0063)
 
 include_directories($<TARGET_PROPERTY:Qt5::Widgets,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
 
                     $<TARGET_PROPERTY:KF5::I18n,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::ConfigCore,INTERFACE_INCLUDE_DIRECTORIES>
                     $<TARGET_PROPERTY:KF5::Service,INTERFACE_INCLUDE_DIRECTORIES>
-
-                    ${CMAKE_CURRENT_SOURCE_DIR}/wizard/
-                    ${CMAKE_CURRENT_SOURCE_DIR}/manager/
 )
 
 set(libvideoslideshow_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/vidslidewizard.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/vidslideintropage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/vidslidealbumspage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/vidslideimagespage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/vidslidevideopage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/vidslideoutputpage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/wizard/vidslidefinalpage.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/vidslidesettings.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/vidslidethread.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/manager/vidslidetask.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/player/vidplayerdlg.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/player/mediaplayerview.cpp
 )
 
 add_library(videoslideshow_src OBJECT ${libvideoslideshow_SRCS})