diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index b9520ca75c..03cc6afe1f 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -34,8 +34,6 @@ PKG_BUILD_FLAGS="+lto"
 get_graphicdrivers
 
 PKG_MESON_OPTS_TARGET="-Ddri-drivers=$DRI_DRIVERS \
-                       -Ddri-drivers-path=$XORG_PATH_DRI \
-                       -Ddri-search-path=$XORG_PATH_DRI \
                        -Dgallium-drivers=$GALLIUM_DRIVERS \
                        -Dgallium-extra-hud=false \
                        -Dgallium-xvmc=false \
diff --git a/packages/x11/lib/libX11/package.mk b/packages/x11/lib/libX11/package.mk
index 8f5deaa4f7..319ee43fc5 100644
--- a/packages/x11/lib/libX11/package.mk
+++ b/packages/x11/lib/libX11/package.mk
@@ -49,11 +49,3 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-secure-rpc \
                            --disable-ipv6 \
                            --without-launchd \
                            --without-lint"
-
-pre_configure_target() {
-  export CC_FOR_BUILD="$HOST_CC"
-  export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
-  export CFLAGS_FOR_BUILD="$HOST_CFLAGS"
-  export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
-  unset PKG_CONFIG_ALLOW_SYSTEM_CFLAGS
-}
diff --git a/packages/x11/proto/xorgproto/package.mk b/packages/x11/proto/xorgproto/package.mk
index cf0fecb6d3..f8cfc5a59d 100644
--- a/packages/x11/proto/xorgproto/package.mk
+++ b/packages/x11/proto/xorgproto/package.mk
@@ -27,8 +27,6 @@ PKG_DEPENDS_TARGET="toolchain util-macros"
 PKG_SECTION="x11/proto"
 PKG_SHORTDESC="combined X.Org X11 Protocol headers"
 PKG_LONGDESC="combined X.Org X11 Protocol headers"
+PKG_TOOLCHAIN="meson"
 
-pre_configure_target() {
-  export LC_ALL=en_US.UTF-8
-}
-
+PKG_MESON_OPTS_TARGET="-Dlegacy=false"