diff --git a/build/wince/tools/Makefile b/build/wince/tools/Makefile
index 212df83b3e45..fdfc61d22ad7 100644
--- a/build/wince/tools/Makefile
+++ b/build/wince/tools/Makefile
@@ -72,7 +72,6 @@ endif
 CFLAGS += \
   -DVC_PATH='"$(subst \,\\,$(VCINSTALLDIR))\\"' \
   -DWM_SDK_PATH='"$(subst \,\\,$(WINCE_SDK_DIR))\\"' \
-  -DOGLES_SDK_PATH='"$(subst \,\\,$(OGLES_SDK_DIR))\\"' \
   -DMOZCE_DEVENV='"$(MOZCE_DEVENV)"' \
   -DTOPSRCDIR='"$(TOPSRCDIR)"' \
   $(NULL)
diff --git a/build/wince/tools/linkargs.c b/build/wince/tools/linkargs.c
index c7cc5614f3b8..f60844f90300 100644
--- a/build/wince/tools/linkargs.c
+++ b/build/wince/tools/linkargs.c
@@ -24,7 +24,6 @@ void addLinkArgs(int k, int s, int *i, int *j, char** args, char** argv) {
   args[(*i)++] = "/LIBPATH:\"" WCE_LIB "\"";
   args[(*i)++] = "/LIBPATH:\"" WCE_CRT "\"";
   args[(*i)++] = "/LIBPATH:\"" ATL_LIB "\"";
-  args[(*i)++] = "/LIBPATH:\"" OGLES_SDK_LIB "\"";
   args[(*i)++] = "/NODEFAULTLIB";
 
   args[(*i)++] = "/MAP";
diff --git a/build/wince/tools/toolspath.c b/build/wince/tools/toolspath.c
index 3e771f47c806..f701777aff46 100644
--- a/build/wince/tools/toolspath.c
+++ b/build/wince/tools/toolspath.c
@@ -199,8 +199,8 @@ DWORD run(char** args)
  _putenv("LIBPATH=");
  _putenv("CC=");
 
- _putenv("INCLUDE=" SHUNT_INC ";" WM_SDK_INC ";" OGLES_SDK_INC ";" WCE_INC);
- _putenv("LIB=" WCE_LIB ";" OGLES_SDK_LIB ";" WCE_CRT);
+ _putenv("INCLUDE=" SHUNT_INC ";" WM_SDK_INC ";" WCE_INC);
+ _putenv("LIB=" WCE_LIB ";" WCE_CRT);
 
  i = strlen(args[0]);
  for (j=0; j<i; j++)
diff --git a/build/wince/tools/toolspath.h b/build/wince/tools/toolspath.h
index 69339080f2c7..b3d0765b3093 100644
--- a/build/wince/tools/toolspath.h
+++ b/build/wince/tools/toolspath.h
@@ -5,8 +5,6 @@
 #include <stdio.h>
 #include <process.h>
 
-#define OGLES_SDK_INC  OGLES_SDK_PATH "inc"
-#define OGLES_SDK_LIB  OGLES_SDK_PATH "lib\\wince\\nvap\\release"
 #define WCE_BIN    VC_PATH "ce\\bin\\x86_arm\\"
 #define WCE_RC_BIN WIN_SDK_PATH  "bin\\"
 #define WCE_CRT    VC_PATH "ce\\lib\\armv4i"
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index c3b36803bbb4..6e1b39b93d87 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -660,12 +660,9 @@ MOZ_PHOENIX	= @MOZ_PHOENIX@
 MOZ_XULRUNNER	= @MOZ_XULRUNNER@
 WINCE		= @WINCE@
 WINCE_SDK_DIR   = @WINCE_SDK_DIR@
-OGLES_SDK_DIR   = @OGLES_SDK_DIR@
 
 WINCE_WINDOWS_MOBILE = @WINCE_WINDOWS_MOBILE@
 
-HAS_OGLES = @HAS_OGLES@
-
 MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
 
 MOZ_PLATFORM_MAEMO = @MOZ_PLATFORM_MAEMO@
diff --git a/configure.in b/configure.in
index f9a54ac00425..309037fb816d 100644
--- a/configure.in
+++ b/configure.in
@@ -366,11 +366,6 @@ case "$target" in
                           The path to the Windows CE SDK],
     WINCE_SDK_DIR=$withval)
 
-    MOZ_ARG_WITH_STRING(ogles-sdk,
-    [  --with-ogles-sdk=OGLES_SDK_DIR
-                          The path to the OGLES SDK],
-    OGLES_SDK_DIR=$withval)
-
     AC_DEFINE(WINCE)
     
     export WINCE=1
@@ -384,9 +379,9 @@ case "$target" in
 
     _pwd=`pwd -W`
     _topsrcdirwin=`cd \`dirname $0\`; pwd -W`
-    make OGLES_SDK_DIR="$OGLES_SDK_DIR" WINCE_SDK_DIR="$WINCE_SDK_DIR" \
-    TOPSRCDIR="$_topsrcdirwin" OBJDIR="$_pwd" target="$target" \
-    -C $srcdir/build/wince/tools
+    make WINCE_SDK_DIR="$WINCE_SDK_DIR" \
+         TOPSRCDIR="$_topsrcdirwin" OBJDIR="$_pwd" target="$target" \
+         -C $srcdir/build/wince/tools
 
     CC="$_pwd/dist/sdk/bin/$target-gcc.exe"
     CXX="$_pwd/dist/sdk/bin/$target-gcc.exe"
@@ -8604,15 +8599,16 @@ if test "$MOZ_TREE_CAIRO"; then
         MOZ_ENABLE_CAIRO_FT=1
         CAIRO_FT_CFLAGS="$FT2_CFLAGS"
     fi
-    if test "$MOZ_WIDGET_TOOLKIT" = "qt"; then
+    case "$MOZ_WIDGET_TOOLKIT" in
+      qt)
         QT_SURFACE_FEATURE="#define CAIRO_HAS_QT_SURFACE 1"
-    fi
-    if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
+        ;;
+      cocoa)
         QUARTZ_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_SURFACE 1"
         QUARTZ_IMAGE_SURFACE_FEATURE="#define CAIRO_HAS_QUARTZ_IMAGE_SURFACE 1"
         QUARTZ_FONT_FEATURE="#define CAIRO_HAS_QUARTZ_FONT 1"
-    fi
-    if test "$MOZ_WIDGET_TOOLKIT" = "windows"; then
+        ;;
+      windows)
         WIN32_SURFACE_FEATURE="#define CAIRO_HAS_WIN32_SURFACE 1"
         if test -z "$WINCE"; then
             WIN32_FONT_FEATURE="#define CAIRO_HAS_WIN32_FONT 1"
@@ -8637,15 +8633,15 @@ if test "$MOZ_TREE_CAIRO"; then
         if test -n "$WIN32_D2D_SURFACE_FEATURE"; then
           MOZ_CHECK_HEADER(d3d10.h, MOZ_ENABLE_D3D10_LAYER=1)
         fi
-
-    fi
-    if test "$MOZ_WIDGET_TOOLKIT" = "os2"; then
+        ;;
+      os2)
         OS2_SURFACE_FEATURE="#define CAIRO_HAS_OS2_SURFACE 1"
         FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
         MOZ_ENABLE_CAIRO_FT=1
         CAIRO_FT_CFLAGS="-I${MZFTCFGFT2}/include"
         CAIRO_FT_LIBS="-L${MZFTCFGFT2}/lib -lmozft -lmzfntcfg"
-    fi
+        ;;
+    esac
     if test "$USE_FC_FREETYPE"; then
         FC_FONT_FEATURE="#define CAIRO_HAS_FC_FONT 1"
     fi
@@ -8655,7 +8651,6 @@ if test "$MOZ_TREE_CAIRO"; then
     AC_SUBST(MOZ_ENABLE_D3D9_LAYER)
     AC_SUBST(MOZ_ENABLE_D3D10_LAYER)
     AC_SUBST(CAIRO_FT_CFLAGS)
-    AC_SUBST(HAS_OGLES)
 
     if test "$MOZ_DEBUG"; then
       SANITY_CHECKING_FEATURE="#define CAIRO_DO_SANITY_CHECKING 1"
@@ -9041,7 +9036,6 @@ AC_SUBST(MOZ_OS2_TOOLS)
 AC_SUBST(MOZ_POST_DSO_LIB_COMMAND)
 AC_SUBST(MOZ_POST_PROGRAM_COMMAND)
 AC_SUBST(MOZ_TIMELINE)
-AC_SUBST(OGLES_SDK_DIR)
 
 AC_SUBST(MOZ_APP_NAME)
 AC_SUBST(MOZ_APP_DISPLAYNAME)
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 2d6ffa962e9c..dacf2dad82dc 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -233,9 +233,6 @@ OS_LIBS += $(call EXPAND_LIBNAME, ceosutil libcmt comsuppw)
 ifdef WINCE_WINDOWS_MOBILE
 OS_LIBS += $(call EXPAND_LIBNAME, cellcore)
 endif
-ifdef HAS_OGLES
-OS_LIBS += $(call EXPAND_LIBNAME, libGLESv2 libEGL)
-endif
 endif
 
 ifdef MOZ_JPROF