Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -17,7 +17,6 @@
     Crash
     I18n
     ItemViews
-    KDELibs4Support
     KIO
     Notifications
     Service
Index: libpala/CMakeLists.txt
===================================================================
--- libpala/CMakeLists.txt
+++ libpala/CMakeLists.txt
@@ -1,5 +1,7 @@
 project(libpala)
 
+include(GenerateExportHeader)
+
 set(libpala_VERSION "0.2.0")
 set(libpala_SOVERSION "0")
 
@@ -28,7 +30,7 @@
 
 add_library(pala SHARED ${libpala_SRCS})
 generate_export_header(pala BASE_NAME libpala)
-target_link_libraries(pala KF5::KDELibs4Support Qt5::Gui)
+target_link_libraries(pala KF5::I18n Qt5::Gui)
 set_target_properties(pala PROPERTIES
 	VERSION ${libpala_VERSION}
 	SOVERSION ${libpala_SOVERSION}
Index: mime/CMakeLists.txt
===================================================================
--- mime/CMakeLists.txt
+++ mime/CMakeLists.txt
@@ -10,7 +10,7 @@
 
 # thumbnail creator plugin
 add_library(palathumbcreator MODULE thumbnail-creator.cpp)
-target_link_libraries(palathumbcreator KF5::KIOCore KF5::KIOWidgets KF5::Archive KF5::KDELibs4Support)
+target_link_libraries(palathumbcreator KF5::KIOCore KF5::KIOWidgets KF5::Archive)
 
 install(TARGETS palathumbcreator DESTINATION ${KDE_INSTALL_PLUGINDIR})
 install(FILES palathumbcreator.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
Index: mime/thumbnail-creator.cpp
===================================================================
--- mime/thumbnail-creator.cpp
+++ mime/thumbnail-creator.cpp
@@ -18,7 +18,6 @@
 ***************************************************************************/
 
 #include <KIO/ThumbCreator>
-#include <kdemacros.h>
 #include <QImage>
 #include <QTemporaryDir>
 #include <KTar>
@@ -34,7 +33,7 @@
 
 extern "C"
 {
-	KDE_EXPORT ThumbCreator* new_creator()
+	Q_DECL_EXPORT ThumbCreator* new_creator()
 	{
 		return new Palapeli::ThumbCreator;
 	}
Index: slicers/CMakeLists.txt
===================================================================
--- slicers/CMakeLists.txt
+++ slicers/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 #correctly include the headers of libpala when they are not yet installed
 set_directory_properties(PROPERTIES COMPILE_DEFINITIONS USE_LOCAL_LIBPALA)
-set(SLICER_LINK_LIBS KF5::KDELibs4Support Qt5::Gui pala)
+set(SLICER_LINK_LIBS KF5::CoreAddons KF5::I18n Qt5::Gui pala)
 
 add_library(palapeli_rectslicer MODULE slicer-rect.cpp)
 target_link_libraries(palapeli_rectslicer ${SLICER_LINK_LIBS})
Index: slicers/goldberg/slicer-goldberg.cpp
===================================================================
--- slicers/goldberg/slicer-goldberg.cpp
+++ slicers/goldberg/slicer-goldberg.cpp
@@ -20,7 +20,6 @@
 
 #include "slicer-goldberg.h"
 
-#include <QMessageBox>
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KPluginLoader>
Index: src/CMakeLists.txt
===================================================================
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -52,9 +52,16 @@
 add_executable(palapeli ${palapeli_SRCS})
 target_link_libraries(palapeli
     pala
-    KF5::KDELibs4Support
     KF5::Archive
+    KF5::Completion
+    KF5::ConfigWidgets
     KF5::Crash
+    KF5::ItemViews
+    KF5::Notifications
+    KF5::KIOWidgets
+    KF5::Service
+    KF5::WidgetsAddons
+    KF5::XmlGui
     Qt5::Concurrent
     Qt5::Svg
 )
Index: src/creator/propertywidget_p.h
===================================================================
--- src/creator/propertywidget_p.h
+++ src/creator/propertywidget_p.h
@@ -21,8 +21,8 @@
 
 #include "propertywidget.h"
 #include <QCheckBox>
+#include <QSpinBox>
 #include <KComboBox>
-#include <KIntSpinBox>
 #include <KLineEdit>
 
 namespace Palapeli