32 files changed, 22 insertions, 22 deletions
diff --git a/src/gpu/GrGpu.cpp b/src/gpu/GrGpu.cpp
index 39960de054..57769e9f4e 100644
--- a/src/gpu/GrGpu.cpp
+++ b/src/gpu/GrGpu.cpp
@@ -14,7 +14,7 @@
 #include "GrContext.h"
 #include "GrIndexBuffer.h"
 #include "GrPathRenderer.h"
-#include "GrGLStencilBuffer.h"
+#include "GrStencilBuffer.h"
 #include "GrVertexBuffer.h"
 
 // probably makes no sense for this to be less than a page
diff --git a/src/gpu/GrGpuFactory.cpp b/src/gpu/GrGpuFactory.cpp
index 7d53e79624..7d0678ef65 100644
--- a/src/gpu/GrGpuFactory.cpp
+++ b/src/gpu/GrGpuFactory.cpp
@@ -17,7 +17,7 @@
 #include "GrGLConfig.h"
 
 #include "GrGpu.h"
-#include "GrGpuGLShaders.h"
+#include "gl/GrGpuGLShaders.h"
 
 GrGpu* GrGpu::Create(GrEngine engine, GrPlatform3DContext context3D) {
 
diff --git a/src/gpu/GrGLContextInfo.cpp b/src/gpu/gl/GrGLContextInfo.cpp
index e6257e7b89..e6257e7b89 100644
--- a/src/gpu/GrGLContextInfo.cpp
+++ b/src/gpu/gl/GrGLContextInfo.cpp
diff --git a/src/gpu/GrGLContextInfo.h b/src/gpu/gl/GrGLContextInfo.h
index cac8959861..cac8959861 100644
--- a/src/gpu/GrGLContextInfo.h
+++ b/src/gpu/gl/GrGLContextInfo.h
diff --git a/src/gpu/GrGLCreateNativeInterface_none.cpp b/src/gpu/gl/GrGLCreateNativeInterface_none.cpp
index 7de59126ce..7de59126ce 100644
--- a/src/gpu/GrGLCreateNativeInterface_none.cpp
+++ b/src/gpu/gl/GrGLCreateNativeInterface_none.cpp
diff --git a/src/gpu/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp
index d4a88c130e..cdac75f553 100644
--- a/src/gpu/GrGLCreateNullInterface.cpp
+++ b/src/gpu/gl/GrGLCreateNullInterface.cpp
@@ -8,6 +8,7 @@
 
 
 #include "GrGLInterface.h"
+#include "../GrTDArray.h"
 
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLActiveTexture(GrGLenum texture) {}
 GrGLvoid GR_GL_FUNCTION_TYPE nullGLAttachShader(GrGLuint program, GrGLuint shader) {}
@@ -124,7 +125,6 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLDeleteIds(GrGLsizei n, const GrGLuint* ids) {
 
 // In debug builds we do asserts that ensure we agree with GL about when a buffer
 // is mapped.
-#include "GrTDArray.h"
 static GrTDArray<GrGLuint> gMappedBuffers;
 static GrGLuint gCurrArrayBuffer;
 static GrGLuint gCurrElementArrayBuffer;
diff --git a/src/gpu/GrGLDefaultInterface_native.cpp b/src/gpu/gl/GrGLDefaultInterface_native.cpp
index 7b8b84a9a8..7b8b84a9a8 100644
--- a/src/gpu/GrGLDefaultInterface_native.cpp
+++ b/src/gpu/gl/GrGLDefaultInterface_native.cpp
diff --git a/src/gpu/GrGLDefaultInterface_none.cpp b/src/gpu/gl/GrGLDefaultInterface_none.cpp
index 2cca135c0a..2cca135c0a 100644
--- a/src/gpu/GrGLDefaultInterface_none.cpp
+++ b/src/gpu/gl/GrGLDefaultInterface_none.cpp
diff --git a/src/gpu/GrGLIRect.h b/src/gpu/gl/GrGLIRect.h
index e94fa21a5a..e94fa21a5a 100644
--- a/src/gpu/GrGLIRect.h
+++ b/src/gpu/gl/GrGLIRect.h
diff --git a/src/gpu/GrGLIndexBuffer.cpp b/src/gpu/gl/GrGLIndexBuffer.cpp
index b64668ede2..b64668ede2 100644
--- a/src/gpu/GrGLIndexBuffer.cpp
+++ b/src/gpu/gl/GrGLIndexBuffer.cpp
diff --git a/src/gpu/GrGLIndexBuffer.h b/src/gpu/gl/GrGLIndexBuffer.h
index c3e2287260..9f32890b28 100644
--- a/src/gpu/GrGLIndexBuffer.h
+++ b/src/gpu/gl/GrGLIndexBuffer.h
@@ -11,7 +11,7 @@
 #ifndef GrGLIndexBuffer_DEFINED
 #define GrGLIndexBuffer_DEFINED
 
-#include "GrIndexBuffer.h"
+#include "../GrIndexBuffer.h"
 #include "GrGLInterface.h"
 
 class GrGpuGL;
diff --git a/src/gpu/GrGLInterface.cpp b/src/gpu/gl/GrGLInterface.cpp
index c1ac088b5f..c1ac088b5f 100644
--- a/src/gpu/GrGLInterface.cpp
+++ b/src/gpu/gl/GrGLInterface.cpp
diff --git a/src/gpu/GrGLProgram.cpp b/src/gpu/gl/GrGLProgram.cpp
index e77638f098..fb9debf348 100644
--- a/src/gpu/GrGLProgram.cpp
+++ b/src/gpu/gl/GrGLProgram.cpp
@@ -9,7 +9,7 @@
 
 #include "GrGLProgram.h"
 
-#include "GrAllocator.h"
+#include "../GrAllocator.h"
 #include "GrGLShaderVar.h"
 #include "SkTrace.h"
 #include "SkXfermode.h"
diff --git a/src/gpu/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h
index 4d80f50032..dc6093ed16 100644
--- a/src/gpu/GrGLProgram.h
+++ b/src/gpu/gl/GrGLProgram.h
@@ -10,11 +10,11 @@
 #ifndef GrGLProgram_DEFINED
 #define GrGLProgram_DEFINED
 
-#include "GrDrawState.h"
+#include "../GrDrawState.h"
 #include "GrGLInterface.h"
 #include "GrGLSL.h"
-#include "GrStringBuilder.h"
-#include "GrGpu.h"
+#include "../GrStringBuilder.h"
+#include "../GrGpu.h"
 
 #include "SkXfermode.h"
 
diff --git a/src/gpu/GrGLRenderTarget.cpp b/src/gpu/gl/GrGLRenderTarget.cpp
index c98914a3b8..c98914a3b8 100644
--- a/src/gpu/GrGLRenderTarget.cpp
+++ b/src/gpu/gl/GrGLRenderTarget.cpp
diff --git a/src/gpu/GrGLRenderTarget.h b/src/gpu/gl/GrGLRenderTarget.h
index eb817df6f0..eb817df6f0 100644
--- a/src/gpu/GrGLRenderTarget.h
+++ b/src/gpu/gl/GrGLRenderTarget.h
diff --git a/src/gpu/GrGLSL.cpp b/src/gpu/gl/GrGLSL.cpp
index e933ee87c9..e933ee87c9 100644
--- a/src/gpu/GrGLSL.cpp
+++ b/src/gpu/gl/GrGLSL.cpp
diff --git a/src/gpu/GrGLSL.h b/src/gpu/gl/GrGLSL.h
index 5b9c5b631f..5b9c5b631f 100644
--- a/src/gpu/GrGLSL.h
+++ b/src/gpu/gl/GrGLSL.h
diff --git a/src/gpu/GrGLShaderVar.h b/src/gpu/gl/GrGLShaderVar.h
index 7bec9f95e5..95c54f3399 100644
--- a/src/gpu/GrGLShaderVar.h
+++ b/src/gpu/gl/GrGLShaderVar.h
@@ -11,7 +11,7 @@
 
 #include "GrGLInterface.h"
 #include "GrGLSL.h"
-#include "GrStringBuilder.h"
+#include "../GrStringBuilder.h"
 
 #define USE_UNIFORM_FLOAT_ARRAYS true
 
diff --git a/src/gpu/GrGLStencilBuffer.cpp b/src/gpu/gl/GrGLStencilBuffer.cpp
index bc0bb364e8..bc0bb364e8 100644
--- a/src/gpu/GrGLStencilBuffer.cpp
+++ b/src/gpu/gl/GrGLStencilBuffer.cpp
diff --git a/src/gpu/GrGLStencilBuffer.h b/src/gpu/gl/GrGLStencilBuffer.h
index eaf7942118..02501e7cd2 100644
--- a/src/gpu/GrGLStencilBuffer.h
+++ b/src/gpu/gl/GrGLStencilBuffer.h
@@ -11,7 +11,7 @@
 #define GrGLStencilBuffer_DEFINED
 
 #include "GrGLInterface.h"
-#include "GrStencilBuffer.h"
+#include "../GrStencilBuffer.h"
 
 class GrGLStencilBuffer : public GrStencilBuffer {
 public:
diff --git a/src/gpu/GrGLTexture.cpp b/src/gpu/gl/GrGLTexture.cpp
index 0a38da3da9..0a38da3da9 100644
--- a/src/gpu/GrGLTexture.cpp
+++ b/src/gpu/gl/GrGLTexture.cpp
diff --git a/src/gpu/GrGLTexture.h b/src/gpu/gl/GrGLTexture.h
index 664742ce63..d13fc4463a 100644
--- a/src/gpu/GrGLTexture.h
+++ b/src/gpu/gl/GrGLTexture.h
@@ -10,7 +10,7 @@
 #ifndef GrGLTexture_DEFINED
 #define GrGLTexture_DEFINED
 
-#include "GrGpu.h"
+#include "../GrGpu.h"
 #include "GrGLRenderTarget.h"
 
 /**
diff --git a/src/gpu/GrGLUtil.cpp b/src/gpu/gl/GrGLUtil.cpp
index f12b407b1a..f12b407b1a 100644
--- a/src/gpu/GrGLUtil.cpp
+++ b/src/gpu/gl/GrGLUtil.cpp
diff --git a/src/gpu/GrGLVertexBuffer.cpp b/src/gpu/gl/GrGLVertexBuffer.cpp
index 33c1e7e3e0..33c1e7e3e0 100644
--- a/src/gpu/GrGLVertexBuffer.cpp
+++ b/src/gpu/gl/GrGLVertexBuffer.cpp
diff --git a/src/gpu/GrGLVertexBuffer.h b/src/gpu/gl/GrGLVertexBuffer.h
index 15fc54a983..ff03d7a425 100644
--- a/src/gpu/GrGLVertexBuffer.h
+++ b/src/gpu/gl/GrGLVertexBuffer.h
@@ -11,7 +11,7 @@
 #ifndef GrGLVertexBuffer_DEFINED
 #define GrGLVertexBuffer_DEFINED
 
-#include "GrVertexBuffer.h"
+#include "../GrVertexBuffer.h"
 #include "GrGLInterface.h"
 
 class GrGpuGL;
diff --git a/src/gpu/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index 6ce6089693..6ce6089693 100644
--- a/src/gpu/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
diff --git a/src/gpu/GrGpuGL.h b/src/gpu/gl/GrGpuGL.h
index 801f915b4c..2e7e90be8b 100644
--- a/src/gpu/GrGpuGL.h
+++ b/src/gpu/gl/GrGpuGL.h
@@ -11,8 +11,8 @@
 #ifndef GrGpuGL_DEFINED
 #define GrGpuGL_DEFINED
 
-#include "GrDrawState.h"
-#include "GrGpu.h"
+#include "../GrDrawState.h"
+#include "../GrGpu.h"
 #include "GrGLContextInfo.h"
 #include "GrGLIndexBuffer.h"
 #include "GrGLIRect.h"
@@ -27,9 +27,9 @@ public:
     const GrGLInterface* glInterface() const { 
         return fGLContextInfo.interface();
     }
-    const GrGLBinding glBinding() const { return fGLContextInfo.binding(); }
-    const GrGLVersion glVersion() const { return fGLContextInfo.version(); }
-    const GrGLSLGeneration glslGeneration() const {
+    GrGLBinding glBinding() const { return fGLContextInfo.binding(); }
+    GrGLVersion glVersion() const { return fGLContextInfo.version(); }
+    GrGLSLGeneration glslGeneration() const {
         return fGLContextInfo.glslGeneration();
     }
 
diff --git a/src/gpu/GrGpuGLShaders.cpp b/src/gpu/gl/GrGpuGLShaders.cpp
index 81706d73f8..968b893349 100644
--- a/src/gpu/GrGpuGLShaders.cpp
+++ b/src/gpu/gl/GrGpuGLShaders.cpp
@@ -7,19 +7,19 @@
  */
 
 
-#include "GrBinHashKey.h"
+#include "../GrBinHashKey.h"
 #include "GrGLProgram.h"
 #include "GrGLSL.h"
 #include "GrGpuGLShaders.h"
-#include "GrGpuVertex.h"
+#include "../GrGpuVertex.h"
 #include "GrNoncopyable.h"
-#include "GrStringBuilder.h"
-#include "GrRandom.h"
+#include "../GrStringBuilder.h"
+#include "../GrRandom.h"
 
 #define SKIP_CACHE_CHECK    true
 #define GR_UINT32_MAX   static_cast<uint32_t>(-1)
 
-#include "GrTHashCache.h"
+#include "../GrTHashCache.h"
 
 class GrGpuGLShaders::ProgramCache : public ::GrNoncopyable {
 private:
diff --git a/src/gpu/GrGpuGLShaders.h b/src/gpu/gl/GrGpuGLShaders.h
index 39bc97471d..39bc97471d 100644
--- a/src/gpu/GrGpuGLShaders.h
+++ b/src/gpu/gl/GrGpuGLShaders.h
diff --git a/src/gpu/SkGLContext.cpp b/src/gpu/gl/SkGLContext.cpp
index 6142d3c572..6142d3c572 100644
--- a/src/gpu/SkGLContext.cpp
+++ b/src/gpu/gl/SkGLContext.cpp
diff --git a/src/gpu/SkNullGLContext.cpp b/src/gpu/gl/SkNullGLContext.cpp
index 04e63d8bbe..04e63d8bbe 100644
--- a/src/gpu/SkNullGLContext.cpp
+++ b/src/gpu/gl/SkNullGLContext.cpp