diff --git a/old-configure.in b/old-configure.in
index 4ecdb65aa35d..a48f458c45a3 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -2334,12 +2334,6 @@ esac
 AC_SUBST(MOZ_ENABLE_CAIRO_FT)
 AC_SUBST(MOZ_ENABLE_D3D10_LAYER)
 
-if test "$MOZ_X11"; then
-    MOZ_CAIRO_OSLIBS="$MOZ_CAIRO_OSLIBS $XLDFLAGS -lXrender"
-fi
-
-AC_SUBST_LIST(MOZ_CAIRO_LIBS)
-AC_SUBST_LIST(MOZ_CAIRO_OSLIBS)
 AC_SUBST(MOZ_TREE_PIXMAN)
 
 dnl ========================================================
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 14b5cb98328d..90bee8fb9e91 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -242,7 +242,6 @@ if CONFIG["MOZ_ANDROID_GOOGLE_VR"]:
         "-lgvr",
     ]
 
-OS_LIBS += CONFIG["MOZ_CAIRO_OSLIBS"]
 OS_LIBS += CONFIG["MOZ_WEBRTC_X11_LIBS"]
 
 if CONFIG["MOZ_SYSTEM_JPEG"]:
@@ -287,6 +286,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
     OS_LIBS += CONFIG["MOZ_PANGO_LIBS"]
     OS_LIBS += CONFIG["XT_LIBS"]
     OS_LIBS += [
+        "Xrender",
         "gthread-2.0",
     ]