diff --git a/mozilla/gfx/thebes/public/gfxImageSurface.h b/mozilla/gfx/thebes/public/gfxImageSurface.h
index d4b02c96d50..b7ada805012 100644
--- a/mozilla/gfx/thebes/public/gfxImageSurface.h
+++ b/mozilla/gfx/thebes/public/gfxImageSurface.h
@@ -45,8 +45,8 @@
 
 class gfxImageSurface : public gfxASurface {
 public:
-    ImageSurface(int format, long width, long height);
-    virtual ~ImageSurface();
+    gfxImageSurface(int format, long width, long height);
+    virtual ~gfxImageSurface();
 
     // <insert refcount stuff here>
 
diff --git a/mozilla/gfx/thebes/public/gfxMatrix.h b/mozilla/gfx/thebes/public/gfxMatrix.h
index f6c9ae6c29b..c26c3cd91c9 100644
--- a/mozilla/gfx/thebes/public/gfxMatrix.h
+++ b/mozilla/gfx/thebes/public/gfxMatrix.h
@@ -105,8 +105,8 @@ public:
         double s = sin(radians);
         double c = cos(radians);
         gfxMatrix t( c, s,
-                 -s, c,
-                  0, 0);
+                    -s, c,
+                     0, 0);
         return *this = t.Multiply(*this);
     }
 
diff --git a/mozilla/gfx/thebes/public/gfxTextRun.h b/mozilla/gfx/thebes/public/gfxTextRun.h
index fca682c3f76..22dacd06d72 100644
--- a/mozilla/gfx/thebes/public/gfxTextRun.h
+++ b/mozilla/gfx/thebes/public/gfxTextRun.h
@@ -59,5 +59,5 @@ class gfxTextRun {
     // the implementor could optimize for that.
     int GetCharsFit(int pos, int len, double width, int breakflags);
 
-    int GetPositionInString(gfxPoint pt);
+    int GetPositionInString(gfxPoint& pt);
 };
diff --git a/mozilla/gfx/thebes/src/gfxImageSurface.cpp b/mozilla/gfx/thebes/src/gfxImageSurface.cpp
index 075b13c09af..a4b1486b15b 100644
--- a/mozilla/gfx/thebes/src/gfxImageSurface.cpp
+++ b/mozilla/gfx/thebes/src/gfxImageSurface.cpp
@@ -35,9 +35,9 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "ImageSurface.h"
+#include "gfxImageSurface.h"
 
-ImageSurface::ImageSurface(int format, long width, long height) :
+gfxImageSurface::gfxImageSurface(int format, long width, long height) :
     mFormat(format), mWidth(width), mHeight(height)
 {
     mData = new unsigned char[width * height * 4];
@@ -50,7 +50,7 @@ ImageSurface::ImageSurface(int format, long width, long height) :
 
 }
 
-ImageSurface::~ImageSurface()
+gfxImageSurface::~gfxImageSurface()
 {
     delete[] mData;
 }
diff --git a/mozilla/gfx/thebes/src/gfxWindowsSurface.cpp b/mozilla/gfx/thebes/src/gfxWindowsSurface.cpp
index 8ce6627aa42..93e2f058e3f 100644
--- a/mozilla/gfx/thebes/src/gfxWindowsSurface.cpp
+++ b/mozilla/gfx/thebes/src/gfxWindowsSurface.cpp
@@ -35,13 +35,13 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "WindowsSurface.h"
+#include "gfxWindowsSurface.h"
 
-WindowsSurface::WindowsSurface(HDC dc)
+gfxWindowsSurface::gfxWindowsSurface(HDC dc)
 {
     Init(cairo_win32_surface_create(dc));
 }
 
-WindowsSurface::~WindowsSurface()
+gfxWindowsSurface::~gfxWindowsSurface()
 {
 }