diff --git a/vars/build.vars b/vars/build.vars
index 64466f6..dbb23ff 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -668,10 +668,12 @@ NATIVE_PACKAGES_DEPS_X11_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGE
 NATIVE_PACKAGES_DEPS_X11_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_PACKAGES_DEPS_X11_PACKAGES="
-util_macros xorgproto xcb_proto xtrans libpthread_stubs libXau xcb xcb_util xcb_util_image xcb_util_wm libX11 libXext freetype fontconfig
-Xrender libXft libXfixes libXi libXtst libICE libSM libXt libXmu libXpm libXaw libxkbfile libXdamage libXfont2 libXdmcp
-mesa glew harfbuzz libfontenc pixman cairo dbus dbus_glib sdl2 pango atk at_spi2_core at_spi2_atk gdk libepoxy
-gtk2 gtk3 imlib2 libcaca libxfce4util xfconf libxfce4ui";
+util_macros xorgproto xcb_proto xtrans libpthread_stubs libXau xcb xcb_util
+xcb_util_image xcb_util_wm libX11 libXext freetype fontconfig Xrender libXft
+libXfixes libXi libXtst libICE libSM libXt libXmu libXpm libXaw libxkbfile
+libXdamage libfontenc libXfont2 libXdmcp mesa glew harfbuzz pixman cairo
+dbus dbus_glib sdl2 pango atk at_spi2_core at_spi2_atk gdk libepoxy gtk2
+gtk3 imlib2 libcaca libxfce4util xfconf libxfce4ui";
 NATIVE_PACKAGES_DEPS_X11_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 : ${PKG_UTIL_MACROS_SHA256SUM:=d7e43376ad220411499a79735020f9d145fdc159284867e99467e0d771f3e712};
@@ -763,6 +765,9 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 : ${PKG_LIBXDAMAGE_SHA256SUM:=7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad};
 : ${PKG_LIBXDAMAGE_VERSION:=1.1.4};
 : ${PKG_LIBXDAMAGE_URL:=https://x.org/releases/individual/lib/libXdamage-${PKG_LIBXDAMAGE_VERSION}.tar.bz2};
+: ${PKG_LIBFONTENC_SHA256SUM:=6fba26760ca8d5045f2b52ddf641c12cedc19ee30939c6478162b7db8b6220fb};
+: ${PKG_LIBFONTENC_VERSION:=1.1.3};
+: ${PKG_LIBFONTENC_URL:=https://x.org/releases/individual/lib/libfontenc-${PKG_LIBFONTENC_VERSION}.tar.gz};
 : ${PKG_LIBXFONT2_SHA256SUM:=0e8ab7fd737ccdfe87e1f02b55f221f0bd4503a1c5f28be4ed6a54586bac9c4e};
 : ${PKG_LIBXFONT2_VERSION:=2.0.3};
 : ${PKG_LIBXFONT2_URL:=https://x.org/releases/individual/lib/libXfont2-${PKG_LIBXFONT2_VERSION}.tar.bz2};
@@ -797,9 +802,6 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python";
 : ${PKG_HARFBUZZ_SHA256SUM:=84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563};
 : ${PKG_HARFBUZZ_CONFIGURE_ARGS_EXTRA:=--with-icu=no};
 : ${PKG_HARFBUZZ_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2"};
-: ${PKG_LIBFONTENC_SHA256SUM:=6fba26760ca8d5045f2b52ddf641c12cedc19ee30939c6478162b7db8b6220fb};
-: ${PKG_LIBFONTENC_VERSION:=1.1.3};
-: ${PKG_LIBFONTENC_URL:=https://x.org/releases/individual/lib/libfontenc-${PKG_LIBFONTENC_VERSION}.tar.gz};
 : ${PKG_DBUS_VERSION:=1.11.20};
 : ${PKG_DBUS_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_VERSION}.tar.gz};
 : ${PKG_DBUS_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa};