diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index eb6a2e0b8a2..32d59895e91 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -81,7 +81,6 @@ XULRUNNER_STUB_NAME = @XULRUNNER_STUB_NAME@
 MOZ_CHROME_FILE_FORMAT	= @MOZ_CHROME_FILE_FORMAT@
 
 MOZ_WIDGET_TOOLKIT	= @MOZ_WIDGET_TOOLKIT@
-MOZ_GFX_TOOLKIT		= @MOZ_GFX_TOOLKIT@
 MOZ_GFX_OPTIMIZE_MOBILE = @MOZ_GFX_OPTIMIZE_MOBILE@
 
 MOZ_DFB			= @MOZ_DFB@
diff --git a/configure.in b/configure.in
index 573b60b4712..4e6ec2ed6bd 100644
--- a/configure.in
+++ b/configure.in
@@ -1078,7 +1078,6 @@ MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
 USE_DEPENDENT_LIBS=1
 
 _PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2
-MOZ_GFX_TOOLKIT='$(MOZ_WIDGET_TOOLKIT)'
 
 MOZ_ENABLE_POSTSCRIPT=1 
 
@@ -4822,12 +4821,10 @@ photon)
 
 cairo-windows)
     MOZ_WIDGET_TOOLKIT=windows
-    MOZ_GFX_TOOLKIT=cairo
     ;;
 
 cairo-gtk2|cairo-gtk2-x11)
     MOZ_WIDGET_TOOLKIT=gtk2
-    MOZ_GFX_TOOLKIT=cairo
     MOZ_ENABLE_GTK2=1
     MOZ_ENABLE_XREMOTE=1
 
@@ -4841,7 +4838,6 @@ cairo-gtk2|cairo-gtk2-x11)
 
 cairo-gtk2-dfb)
     MOZ_WIDGET_TOOLKIT=gtk2
-    MOZ_GFX_TOOLKIT=cairo
     MOZ_ENABLE_GTK2=1
 
     AC_DEFINE(MOZ_DFB)
@@ -4858,7 +4854,6 @@ cairo-gtk2-dfb)
 
 cairo-qt)
     MOZ_WIDGET_TOOLKIT=qt
-    MOZ_GFX_TOOLKIT=cairo
     MOZ_ENABLE_QT=1
     MOZ_ENABLE_XREMOTE=1
     USE_ELF_DYNSTR_GC=
@@ -4874,14 +4869,12 @@ cairo-qt)
 
 cairo-beos)
     MOZ_WIDGET_TOOLKIT=beos
-    MOZ_GFX_TOOLKIT=cairo
     TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)'
     TK_LIBS='$(MOZ_CAIRO_LIBS)'
     ;;
 
 cairo-os2)
     MOZ_WIDGET_TOOLKIT=os2
-    MOZ_GFX_TOOLKIT=cairo
     TK_CFLAGS='$(MOZ_CAIRO_CFLAGS)'
     TK_LIBS='$(MOZ_CAIRO_LIBS)'
     ;;
@@ -4890,7 +4883,6 @@ cairo-cocoa)
     MOZ_WIDGET_TOOLKIT=cocoa
     AC_DEFINE(MOZ_WIDGET_COCOA)
     MOZ_ENABLE_COCOA=1
-    MOZ_GFX_TOOLKIT=cairo
     MOZ_USER_DIR="Mozilla"
     AC_DEFINE(XP_MACOSX)
     AC_DEFINE(TARGET_CARBON)
@@ -7959,7 +7951,6 @@ AC_SUBST(FILTER)
 AC_SUBST(BIN_FLAGS)
 AC_SUBST(NS_USE_NATIVE)
 AC_SUBST(MOZ_WIDGET_TOOLKIT)
-AC_SUBST(MOZ_GFX_TOOLKIT)
 AC_SUBST(MOZ_UPDATE_XTERM)
 AC_SUBST(MINIMO)
 AC_SUBST(MOZ_PLATFORM_HILDON)
diff --git a/js/src/configure.in b/js/src/configure.in
index 3c733a892d7..4e2093e7ca8 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -882,7 +882,6 @@ MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat'
 USE_DEPENDENT_LIBS=1
 
 _PLATFORM_DEFAULT_TOOLKIT=cairo-gtk2
-MOZ_GFX_TOOLKIT='$(MOZ_WIDGET_TOOLKIT)'
 
 MOZ_ENABLE_POSTSCRIPT=1