diff --git a/aports/kde/consolekit2/APKBUILD b/aports/kde/consolekit2/APKBUILD
deleted file mode 100644
index fe3b504a..00000000
--- a/aports/kde/consolekit2/APKBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-pkgbase=ConsoleKit2
-pkgname=consolekit2
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="A framework for defining and tracking users, login sessions, and seats. "
-arch="all"
-url="https://consolekit2.github.io/ConsoleKit2"
-license="GPL"
-depends="gettext glib zlib polkit eudev libdrm cgmanager libnih"
-makedepends="git automake autoconf gettext-dev glib-dev zlib-dev libxslt-dev
-			 polkit-dev eudev-dev libdrm-dev cgmanager-dev libnih-dev libtool
-			 xorg-server-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/${pkgver}.tar.gz
-		ac_disable_static.patch"
-subpackages="$pkgname-doc $pkgname-lang"
-
-prepare() {
-	cd $srcdir/$pkgbase-$pkgver
-	patch -p1 < $srcdir/ac_disable_static.patch
-	NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-	cd $srcdir/$pkgbase-$pkgver
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-		--disable-static
-	sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-	make
-}
-
-package() {
-	cd $srcdir/$pkgbase-$pkgver
-	make DESTDIR="$pkgdir" install
-}
-sha512sums="30f2ceec14044669f40676e9b17513874350e2b70f0a918be934f7e64309c8595dbec4ac0937044c98dda51eb97c99443dc9d1de33f08365d72da8600296ad78  consolekit2-1.2.0.tar.gz
-0f628fd1589b1790ad9adcb2278de504b75cc6b4ec7284a1cbda44ebd34b9966014989f47f343cb936d8503acc4eeec43ddff07cb11f55388e47256b8420e2e8  ac_disable_static.patch"
diff --git a/aports/kde/consolekit2/ac_disable_static.patch b/aports/kde/consolekit2/ac_disable_static.patch
deleted file mode 100644
index 38d6f12a..00000000
--- a/aports/kde/consolekit2/ac_disable_static.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 071a0d8..7469697 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,6 @@ AC_SEARCH_LIBS([strerror],[cposix])
- AC_PROG_CC
- AM_PROG_CC_C_O
- AC_HEADER_STDC
--AC_DISABLE_STATIC
--LT_INIT
-+LT_INIT([disable-static])
- AC_HEADER_STDC
- AC_FUNC_FORK
diff --git a/aports/kde/kcrash/APKBUILD b/aports/kde/kcrash/APKBUILD
index 6e0af12c..e173ff48 100644
--- a/aports/kde/kcrash/APKBUILD
+++ b/aports/kde/kcrash/APKBUILD
@@ -6,7 +6,7 @@ arch="all"
 url='https://community.kde.org/Frameworks'
 license="LGPL"
 depends="kcoreaddons kwindowsystem"
-makedepends="extra-cmake-modules mesa-dev doxygen qt5-qttools-dev kcoreaddons kwindowsystem"
+makedepends="extra-cmake-modules mesa-dev doxygen qt5-qttools-dev kcoreaddons kwindowsystem-dev"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 
 prepare() {
diff --git a/aports/kde/kwin/APKBUILD b/aports/kde/kwin/APKBUILD
index f1020f4f..72b359c3 100644
--- a/aports/kde/kwin/APKBUILD
+++ b/aports/kde/kwin/APKBUILD
@@ -10,7 +10,7 @@ depends="xcb-util-cursor xcb-util-keysyms hicolor-icon-theme plasma-framework li
 makedepends="extra-cmake-modules qt5-qttools-dev kdoctools kdecoration
 			 libxkbcommon-dev libepoxy-dev libinput-dev kcmutils kscreenlocker
 			 breeze xcb-util-cursor-dev qt5-qtdeclarative-dev qt5-qtscript-dev
-			 plasma-framework kinit kio-dev xcb-util-keysyms-dev"
+			 plasma-framework kinit kio-dev xcb-util-keysyms-dev qt5-x11extras-dev"
 # qt5-qtvirtualkeyboard: optional for virtual keyboard support
 source="https://download.kde.org/stable/plasma/${pkgver}/${pkgname}-${pkgver}.tar.xz
 		D6291.patch"
diff --git a/aports/kde/kwindowsystem/APKBUILD b/aports/kde/kwindowsystem/APKBUILD
index 983e92fe..b711153a 100644
--- a/aports/kde/kwindowsystem/APKBUILD
+++ b/aports/kde/kwindowsystem/APKBUILD
@@ -9,6 +9,7 @@ depends="qt5-x11extras libxfixes"
 makedepends="extra-cmake-modules qt5-qttools-dev doxygen qt5-x11extras-dev libxrender-dev xcb-util-keysyms-dev"
 groups="kf5"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
 prepare() {  
 	mkdir -p $srcdir/build