diff --git a/gpu/src/GrGLDefaultInterface_none.cpp b/gpu/src/GrGLDefaultInterface_none.cpp
index b6308e3b68..b487d5314e 100644
--- a/gpu/src/GrGLDefaultInterface_none.cpp
+++ b/gpu/src/GrGLDefaultInterface_none.cpp
@@ -6,6 +6,7 @@
  * found in the LICENSE file.
  */
 
+struct GrGLinterface;
 
 const GrGLInterface* GrGLDefaultInterface() {
     return NULL;
diff --git a/gpu/src/GrGpuGL.cpp b/gpu/src/GrGpuGL.cpp
index 92d836da1e..fefc914b50 100644
--- a/gpu/src/GrGpuGL.cpp
+++ b/gpu/src/GrGpuGL.cpp
@@ -541,6 +541,9 @@ GrGpuGL::GrGpuGL(const GrGLInterface* gl, GrGLBinding glBinding)
 }
 
 GrGpuGL::~GrGpuGL() {
+    // This subclass must do this before the base class destructor runs
+    // since we will unref the GrGLInterface.
+    this->releaseResources();
     fGL->unref();
 }