diff --git a/recipes/libice b/recipes/libice
index 50ce913d8..1eb3140ab 100644
--- a/recipes/libice
+++ b/recipes/libice
@@ -5,7 +5,7 @@ tarball_url="https://www.x.org/archive/individual/lib/libICE-${version}.tar.gz"
 tarball_blake2b="1acb1cdb5b0fd49451b6e4498061c16fff35711a19a5da2c2de0046b6b3ed6bd6bdccf8d45f7adcdb7f2f685245176488f149b41087e562945754088f18c220b"
 source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
-deps="core-libs xorg-util-macros xorg-proto libx11 xtrans"
+deps="core-libs xorg-proto xtrans"
 
 regenerate() {
     autoreconf -fvi
diff --git a/recipes/libsm b/recipes/libsm
index 545b43d99..456ca008f 100644
--- a/recipes/libsm
+++ b/recipes/libsm
@@ -3,9 +3,9 @@ version=1.2.4
 revision=1
 tarball_url="https://www.x.org/archive/individual/lib/libSM-${version}.tar.gz"
 tarball_blake2b="9f05c36f933ddbe66e06a96c7b9f5c23a2b5218da724a838b42ef4b798195c24a2be13e1d5c61bccf7660a4880f78da8452fa93a668f483ce808ce840c2cfcfb"
-source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
+source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros xtrans"
 hostdeps="gcc autoconf automake libtool pkg-config"
-deps="core-libs xorg-util-macros xorg-proto libx11 xtrans libice"
+deps="core-libs xorg-proto libice"
 
 regenerate() {
     autoreconf -fvi
diff --git a/recipes/libxft b/recipes/libxft
index 12de77738..b342ef51d 100644
--- a/recipes/libxft
+++ b/recipes/libxft
@@ -5,7 +5,7 @@ tarball_url="https://www.x.org/archive/individual/lib/libXft-${version}.tar.gz"
 tarball_blake2b="06d797ed53df793e5b9751bc7984a62a96c973e36d8aa99e4dc96a03e0e7013d6adc9e46f033e1ffcb4632cec2ac0318108ff2894beb4464d44d524254b15328"
 source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
-deps="core-libs xorg-util-macros xorg-proto libx11 libxrender freetype fontconfig"
+deps="core-libs libxrender fontconfig"
 
 regenerate() {
     autoreconf -fvi
diff --git a/recipes/libxt b/recipes/libxt
index bfa024696..730566af1 100644
--- a/recipes/libxt
+++ b/recipes/libxt
@@ -6,7 +6,7 @@ tarball_blake2b="3fc41d02802ccfda270030bcad73c0ca14c5b986d7353d8395339053a4d3435
 source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
 imagedeps="gcc"
 hostdeps="gcc autoconf automake libtool pkg-config"
-deps="core-libs xorg-util-macros xorg-proto libx11 xtrans libsm libice"
+deps="core-libs libx11 libsm"
 
 regenerate() {
     autoreconf -fvi
diff --git a/recipes/twm b/recipes/xorg-twm
similarity index 92%
rename from recipes/twm
rename to recipes/xorg-twm
index 082896b00..7a8aa1025 100644
--- a/recipes/twm
+++ b/recipes/xorg-twm
@@ -1,11 +1,11 @@
-name=twm
+name=xorg-twm
 version=1.0.12
 revision=1
 tarball_url="https://www.x.org/pub/individual/app/twm-${version}.tar.xz"
 tarball_blake2b="4bca3572dc51af6d1724aefc42f85f04cf0dcbf5514d098628b7950b59a05bd1f1f6fe51aed492777fad5b169a0d97d0c1f0567aca3e7f33c7de0037c7dbe49f"
 source_hostdeps="autoconf automake libtool pkg-config xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
-deps="core-libs xorg-server xsetroot"
+deps="core-libs libxmu"
 
 regenerate() {
     autoreconf -fvi
diff --git a/recipes/xkbutils b/recipes/xorg-xkbutils
similarity index 87%
rename from recipes/xkbutils
rename to recipes/xorg-xkbutils
index 8042174be..433bb1243 100644
--- a/recipes/xkbutils
+++ b/recipes/xorg-xkbutils
@@ -1,11 +1,11 @@
-name=xkbutils
+name=xorg-xkbutils
 version=1.0.5
 revision=1
 tarball_url="https://www.x.org/archive/individual/app/xkbutils-${version}.tar.xz"
 tarball_blake2b="ac2572b31638120dd5c5e92497f9cde4b43df7ab0f13882f5f1fbac71084dc112a1f9e34d10adf5a4eb83b1b1636ab2388ae8675be5ac1048a3913ac7b0d7f53"
 source_hostdeps="automake autoconf libtool pkg-config xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
-deps="core-libs xorg-util-macros xorg-proto libx11 libxt libxaw"
+deps="core-libs xorg-proto libx11 libxt libxaw"
 
 regenerate() {
     autoreconf -fvi
diff --git a/recipes/xsetroot b/recipes/xorg-xsetroot
similarity index 88%
rename from recipes/xsetroot
rename to recipes/xorg-xsetroot
index aa8696dcc..a5b21501b 100644
--- a/recipes/xsetroot
+++ b/recipes/xorg-xsetroot
@@ -1,11 +1,11 @@
-name=xsetroot
+name=xorg-xsetroot
 version=1.1.2
 revision=1
 tarball_url="https://www.x.org/archive/individual/app/xsetroot-${version}.tar.gz"
 tarball_blake2b="748f5d1a3f2e49883c46406f5ed04aa97f58c1d007ae4a976ffc4e7e816e3c87a2605ab3a288b7448e6877256684ad07b15ae78e97c319cc60f32efaf1732c2e"
 source_hostdeps="autoconf automake libtool pkg-config xorg-util-macros"
 hostdeps="gcc autoconf automake libtool pkg-config"
-deps="core-libs xorg-server libxmu xbitmaps libxcursor"
+deps="core-libs libx11 libxmu xbitmaps libxcursor"
 
 regenerate() {
     autoreconf -fvi