--- a/gfx/layers/GLImages.cpp
+++ b/gfx/layers/GLImages.cpp
@@ -1,21 +1,22 @@
 #ifdef MOZ_WIDGET_ANDROID
 
 #include "GLImages.h"
 #include "GLContext.h"
 #include "GLContextProvider.h"
 #include "ScopedGLHelpers.h"
-#include "GLImages.h"
 #include "GLBlitHelper.h"
 #include "GLReadTexImageHelper.h"
 #include "AndroidSurfaceTexture.h"
 
 using namespace mozilla;
+using namespace mozilla::gfx;
 using namespace mozilla::gl;
+using namespace mozilla::layers;
 
 static Mutex sSnapshotMutex("SurfaceTextureImage::sSnapshotMutex");
 static nsRefPtr<GLContext> sSnapshotContext;
 
 TemporaryRef<gfx::SourceSurface>
 SurfaceTextureImage::GetAsSourceSurface()
 {
   MutexAutoLock lock(sSnapshotMutex);

--- a/gfx/layers/opengl/TextureClientOGL.h
+++ b/gfx/layers/opengl/TextureClientOGL.h
@@ -69,17 +69,17 @@ protected:
 };
 
 #ifdef MOZ_WIDGET_ANDROID
 
 class SurfaceTextureClient : public TextureClient
 {
 public:
   SurfaceTextureClient(TextureFlags aFlags,
-                       AndroidSurfaceTexture* aSurfTex,
+                       gl::AndroidSurfaceTexture* aSurfTex,
                        gfx::IntSize aSize,
                        bool aInverted);
 
   ~SurfaceTextureClient();
 
   virtual bool IsAllocated() const MOZ_OVERRIDE { return true; }
 
   virtual bool HasInternalBuffer() const MOZ_OVERRIDE { return false; }
@@ -108,17 +108,17 @@ public:
   }
 
   virtual bool AllocateForSurface(gfx::IntSize aSize, TextureAllocationFlags aFlags) MOZ_OVERRIDE
   {
     return false;
   }
 
 protected:
-  const RefPtr<AndroidSurfaceTexture> mSurfTex;
+  const RefPtr<gl::AndroidSurfaceTexture> mSurfTex;
   const gfx::IntSize mSize;
   bool mIsLocked;
 };
 
 #endif // MOZ_WIDGET_ANDROID
 
 } // namespace
 } // namespace