diff --git a/hw/xfree86/dixmods/meson.build b/hw/xfree86/dixmods/meson.build
index 028350af4..b4617c17c 100644
--- a/hw/xfree86/dixmods/meson.build
+++ b/hw/xfree86/dixmods/meson.build
@@ -6,7 +6,7 @@ shared_module(
     c_args: [ xorg_c_args, wfb_args ],
     dependencies: common_dep,
     link_whole: libxserver_wfb,
-    link_with: e,
+    link_with: xorg_server,
 
     install: true,
     install_dir: module_dir,
@@ -20,7 +20,7 @@ shared_module(
     c_args: xorg_c_args,
     dependencies: common_dep,
     link_whole: libxserver_miext_shadow,
-    link_with: e,
+    link_with: xorg_server,
 
     install: true,
     install_dir: module_dir,
@@ -35,7 +35,7 @@ if build_glx
         c_args: [ xorg_c_args, glx_align64 ],
         dependencies: [ common_dep, dl_dep, dri_dep ],
         link_whole: libxserver_glx,
-        link_with: e,
+        link_with: xorg_server,
 
         install: true,
         install_dir: module_dir / 'extensions'
diff --git a/hw/xfree86/drivers/inputtest/meson.build b/hw/xfree86/drivers/inputtest/meson.build
index e7a7ff4d6..877fbc7ed 100644
--- a/hw/xfree86/drivers/inputtest/meson.build
+++ b/hw/xfree86/drivers/inputtest/meson.build
@@ -14,7 +14,7 @@ shared_module(
     install: true,
     install_dir: module_dir / 'input',
 
-    link_with: e,
+    link_with: xorg_server,
 )
 
 install_man(configure_file(
diff --git a/hw/xfree86/exa/meson.build b/hw/xfree86/exa/meson.build
index 75a5d429e..28c64be68 100644
--- a/hw/xfree86/exa/meson.build
+++ b/hw/xfree86/exa/meson.build
@@ -2,7 +2,7 @@ xorg_exa = shared_module('exa',
     'examodule.c',
     include_directories: [inc, xorg_inc],
     dependencies: common_dep,
-    link_with: [libxserver_exa, e],
+    link_with: [libxserver_exa, xorg_server],
     c_args: xorg_c_args,
     install: true,
     install_dir: module_dir,
diff --git a/hw/xfree86/fbdevhw/meson.build b/hw/xfree86/fbdevhw/meson.build
index f3146f3c9..555d38047 100644
--- a/hw/xfree86/fbdevhw/meson.build
+++ b/hw/xfree86/fbdevhw/meson.build
@@ -11,7 +11,7 @@ shared_module('fbdevhw',
     c_args: xorg_c_args,
     install: true,
     install_dir: module_dir,
-    link_with: e,
+    link_with: xorg_server,
 )
 
 install_data('fbdevhw.h', install_dir: xorgsdkdir)
diff --git a/hw/xfree86/meson.build b/hw/xfree86/meson.build
index a6fa7f26e..6f27b5db0 100644
--- a/hw/xfree86/meson.build
+++ b/hw/xfree86/meson.build
@@ -101,7 +101,7 @@ else
     xorg_install_dir = get_option('bindir')
 endif
 
-e = executable(
+xorg_server = executable(
     'Xorg',
     srcs_xorg,
     include_directories: [inc, xorg_inc],
diff --git a/hw/xfree86/shadowfb/meson.build b/hw/xfree86/shadowfb/meson.build
index 7ecc9bc30..84d4dd88a 100644
--- a/hw/xfree86/shadowfb/meson.build
+++ b/hw/xfree86/shadowfb/meson.build
@@ -5,7 +5,7 @@ shared_module('shadowfb',
     c_args: xorg_c_args,
     install: true,
     install_dir: module_dir,
-    link_with: e,
+    link_with: xorg_server,
 )
 
 install_data('shadowfb.h', install_dir: xorgsdkdir)