diff --git a/extensions/canvas3d/install.rdf b/extensions/canvas3d/install.rdf
index dfe647bcc98e..04bdefbe418b 100644
--- a/extensions/canvas3d/install.rdf
+++ b/extensions/canvas3d/install.rdf
@@ -16,15 +16,25 @@
 	     extension was built for, because of the way we're tied
 	     to internal interfaces.
 	  -->
+#ifdef MOZILLA_1_8_BRANCH
+        <em:minVersion>2.0b1</em:minVersion>
+        <em:maxVersion>2.0.*</em:maxVersion>
+#else
         <em:minVersion>3.0a1</em:minVersion>
         <em:maxVersion>3.0a1</em:maxVersion>
+#endif
       </Description>
     </em:targetApplication>
 	
     <!-- front-end metadata -->
     <em:creator>Vladimir Vukicevic/mozilla.com</em:creator>
-    <em:name>Canvas 3D</em:name>
-    <em:description>Canvas 3D context(s)</em:description>
+#ifdef MOZILLA_1_8_BRANCH
+    <em:name>Canvas 3D (Gecko 1.8.1)</em:name>
+    <em:description>Canvas 3D context(s) for Gecko 1.8.1</em:description>
+#else
+    <em:name>Canvas 3D (Gecko 1.9)</em:name>
+    <em:description>Canvas 3D context(s) for Gecko 1.9</em:description>
+#endif
     <em:homepageURL>http://people.mozilla.com/~vladimir/canvas3d/</em:homepageURL>
   </Description>
 </RDF>
diff --git a/extensions/canvas3d/src/Makefile.in b/extensions/canvas3d/src/Makefile.in
index 313fbcf859ba..1a93a0a6b7bb 100644
--- a/extensions/canvas3d/src/Makefile.in
+++ b/extensions/canvas3d/src/Makefile.in
@@ -79,9 +79,12 @@ REQUIRES	= \
 		uconv \
 		intl \
 		cairo \
-		thebes \
 		$(NULL)
 
+ifdef MOZ_ENABLE_CAIRO_GFX
+REQUIRES += thebes
+endif
+
 GLITZ_SRC_DIR = $(topsrcdir)/gfx/cairo/glitz/src
 VPATH += $(GLITZ_SRC_DIR)
 
@@ -151,7 +154,11 @@ CPPSRCS		= nsCanvas3DModule.cpp \
 
 DEFINES += -DXPCOM_GLUE -DGLEW_MX -DGLEW_STATIC
 
-EXTRA_DSO_LIBS += thebes js3250 mozcairo mozlibpixman xpcom nspr4 xpcom_core
+EXTRA_DSO_LIBS += js3250 mozcairo mozlibpixman xpcom nspr4 xpcom_core
+
+ifdef MOZ_ENABLE_CAIRO_GFX
+EXTRA_DSO_LIBS += thebes
+endif
 
 # Hack for getting an extension built against static vs. dynamic versions of firefox
 ifeq (,$(BUILD_STATIC_LIBS))
diff --git a/extensions/canvas3d/src/nsCanvasRenderingContextGLES11.cpp b/extensions/canvas3d/src/nsCanvasRenderingContextGLES11.cpp
index 1d7e9f5eea9b..5f81f9cd550c 100644
--- a/extensions/canvas3d/src/nsCanvasRenderingContextGLES11.cpp
+++ b/extensions/canvas3d/src/nsCanvasRenderingContextGLES11.cpp
@@ -49,9 +49,10 @@
 
 #ifndef MOZILLA_1_8_BRANCH
 #include "nsIDocument.h"
-#include "nsTransform2D.h"
 #endif
 
+#include "nsTransform2D.h"
+
 #include "nsIScriptSecurityManager.h"
 #include "nsISecurityCheckedComponent.h"