diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 83e6630cb89..acfa45fe87c 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
  -DSPHINX_MAN=1 -DCMAKE_MAN_DIR=/share/man
  -DBUILD_QtDialog=ON -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DKWSYS_LFS_WORKS=1"
-hostmakedepends="qt6-base-devel python3-Sphinx qt6-tools"
+hostmakedepends="qt6-base python3-Sphinx qt6-tools"
 makedepends="jsoncpp-devel libarchive-devel libcurl-devel libuv-devel
  ncurses-devel qt6-base-devel rhash-devel qt6-tools-devel"
 depends="desktop-file-utils shared-mime-info cmake>=${version}"
diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template
index 9a15f84124f..2db07188cc1 100644
--- a/srcpkgs/fcitx5-qt/template
+++ b/srcpkgs/fcitx5-qt/template
@@ -6,7 +6,7 @@ build_style=cmake
 configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON
  -DENABLE_QT6=ON -DQT_HOST_PATH=/usr"
 hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen
- extra-cmake-modules qt5-qmake qt5-host-tools qt6-base-devel"
+ extra-cmake-modules qt5-qmake qt5-host-tools qt6-base"
 makedepends="libfcitx5-devel fmt-devel qt5-devel libxkbcommon-devel
  qt6-base-devel"
 short_desc="Flexible Context-aware Input Tool with eXtension v5 - Qt"
diff --git a/srcpkgs/focuswriter/template b/srcpkgs/focuswriter/template
index c6e74bee634..ac98ed65cd9 100644
--- a/srcpkgs/focuswriter/template
+++ b/srcpkgs/focuswriter/template
@@ -3,7 +3,7 @@ pkgname=focuswriter
 version=1.8.4
 revision=1
 build_style=cmake
-hostmakedepends="pkg-config qt6-tools-devel"
+hostmakedepends="pkg-config qt6-tools"
 makedepends="hunspell-devel pulseaudio-devel qt6-multimedia-devel"
 short_desc="Simple, distraction-free word processor with a hide-away interface"
 maintainer="Andrew Benson <abenson+void@gmail.com>"
diff --git a/srcpkgs/obs/template b/srcpkgs/obs/template
index e0348ec5c20..1a7132ae832 100644
--- a/srcpkgs/obs/template
+++ b/srcpkgs/obs/template
@@ -6,7 +6,7 @@ archs="i686* x86_64* ppc64le* aarch64*"
 build_style=cmake
 configure_args="-DOBS_VERSION_OVERRIDE=${version} -DENABLE_JACK=ON
  -DENABLE_VST=OFF -DENABLE_AJA=OFF"
-hostmakedepends="pkg-config swig python3-devel qt6-base-devel"
+hostmakedepends="pkg-config swig python3-devel qt6-base"
 makedepends="LuaJIT-devel fdk-aac-devel ffmpeg-devel glu-devel
  jack-devel libXcomposite-devel libcurl-devel libva-devel
  pulseaudio-devel python3-devel speexdsp-devel v4l-utils-devel
diff --git a/srcpkgs/python3-PyQt5-networkauth/template b/srcpkgs/python3-PyQt5-networkauth/template
index afc1c617523..9404cbe46bd 100644
--- a/srcpkgs/python3-PyQt5-networkauth/template
+++ b/srcpkgs/python3-PyQt5-networkauth/template
@@ -3,8 +3,8 @@ pkgname=python3-PyQt5-networkauth
 version=5.15.5
 revision=2
 build_style=sip-build
-hostmakedepends="qt5-qmake python3-PyQt5-devel pkg-config sip
- python3-PyQt-builder"
+build_helper="python3"
+hostmakedepends="qt5-qmake pkg-config sip python3-PyQt-builder"
 makedepends="python3-devel python3-PyQt5-devel qt5-networkauth-devel"
 depends="python3-PyQt5>=$version"
 short_desc="Python bindings for the Qt5 Network Authorization library"
diff --git a/srcpkgs/python3-PyQt5-webengine/template b/srcpkgs/python3-PyQt5-webengine/template
index a38c189cfd4..2837ac87388 100644
--- a/srcpkgs/python3-PyQt5-webengine/template
+++ b/srcpkgs/python3-PyQt5-webengine/template
@@ -3,9 +3,8 @@ pkgname=python3-PyQt5-webengine
 version=5.15.6
 revision=2
 build_style=sip-build
-build_helper="qmake"
-hostmakedepends="pkg-config qt5-qmake python3-PyQt5-devel
- sip python3-PyQt-builder"
+build_helper="qmake python3"
+hostmakedepends="pkg-config qt5-qmake sip python3-PyQt-builder"
 makedepends="qt5-declarative-devel qt5-webchannel-devel qt5-location-devel
  qt5-webengine-devel python3-devel python3-PyQt5-devel"
 depends="python3-PyQt5>=${version} python3-PyQt5-webchannel>=${version}"
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index e42840bf6fe..8eb1b7891f6 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -3,11 +3,10 @@ pkgname=qtcreator
 version=9.0.1
 revision=1
 build_style=cmake
-configure_args="$(vopt_bool qbs BUILD_QBS) -DWITH_DOCS=ON -DBUILD_WITH_PCH=OFF
- -DQT_HOST_PATH=/usr/ -DQT_HOST_PATH_CMAKE_DIR=/usr/lib64/cmake/Qt6"
+configure_args="$(vopt_bool qbs BUILD_QBS) -DWITH_DOCS=ON -DBUILD_WITH_PCH=OFF"
 hostmakedepends="clang llvm perl pkg-config python3 which
- qt6-base-devel qt6-tools qtchooser qt6-shadertools-devel"
-makedepends="qt6-declarative-devel
+ qt6-base qt6-tools qtchooser qt6-shadertools"
+makedepends="qt6-declarative-devel qt6-tools-devel
  qt6-quick3d-devel qt6-svg-devel qt6-plugin-odbc qt6-plugin-sqlite
  qt6-plugin-pgsql qt6-plugin-mysql qt6-qt5compat-devel
  qt6-serialport-devel
@@ -27,7 +26,6 @@ build_options="qbs"
 desc_option_qbs="Build vendored Qbs"
 
 if [ -z "$XBPS_CROSS_BUILD" ]; then
-	hostmakedepends+=" qt6-tools-devel"
 	build_options_default="qbs"
 fi
 
diff --git a/srcpkgs/qtractor/template b/srcpkgs/qtractor/template
index 1b51481af77..89e6a71934a 100644
--- a/srcpkgs/qtractor/template
+++ b/srcpkgs/qtractor/template
@@ -7,7 +7,7 @@ _vst3sdk_tag=3.7.7_build_19
 create_wrksrc=yes
 build_wrksrc="qtractor"
 build_style=cmake
-hostmakedepends="pkg-config qt6-base-devel qt6-tools-devel"
+hostmakedepends="pkg-config qt6-base qt6-tools"
 makedepends="aubio-devel dssi-devel jack-devel ladspa-sdk liblo-devel
  libmad-devel libsamplerate-devel libsndfile-devel libvorbis-devel lilv-devel
  qt6-base-devel qt6-svg-devel rubberband-devel sratom-devel"
diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template
index 23849b28eb7..4c0ddfcbacc 100644
--- a/srcpkgs/strawberry/template
+++ b/srcpkgs/strawberry/template
@@ -20,7 +20,7 @@ build_options="qt6"
 
 if [ "$build_option_qt6" ]; then
 	configure_args="-DBUILD_WITH_QT6=ON -DQT_HOST_PATH=/usr"
-	hostmakedepends+=" qt6-base-devel qt6-tools-devel"
+	hostmakedepends+=" qt6-base qt6-tools"
 	makedepends+=" qt6-base-devel qt6-plugin-mysql
 	 qt6-plugin-odbc qt6-plugin-pgsql qt6-plugin-sqlite"
 	depends+=" qt6-plugin-sqlite"
diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template
index 76782d5453e..fabbed00aba 100644
--- a/srcpkgs/telegram-desktop/template
+++ b/srcpkgs/telegram-desktop/template
@@ -10,8 +10,8 @@ configure_args="-DTDESKTOP_API_ID=209235
  -DDESKTOP_APP_DISABLE_SPELLCHECK=$(vopt_if spellcheck 'false' 'true')
  -DWaylandScanner_EXECUTABLE=/usr/bin/wayland-scanner
  -DQT_HOST_PATH=/usr"
-hostmakedepends="pkg-config qt6-base-devel python3 extra-cmake-modules
- qt6-wayland-devel wayland-devel protobuf"
+hostmakedepends="pkg-config qt6-base python3 extra-cmake-modules
+ qt6-wayland-tools wayland-devel protobuf"
 makedepends="alsa-lib-devel ffmpeg-devel libdbusmenu-glib-devel libopenal-devel
  minizip-devel opus-devel xxHash-devel pulseaudio-devel range-v3
  qt6-svg-devel libva-devel rapidjson liblz4-devel liblzma-devel gtk+3-devel