diff --git a/libs/hwui/Caches.cpp b/libs/hwui/Caches.cpp
index a4def0b..e0094d8 100644
--- a/libs/hwui/Caches.cpp
+++ b/libs/hwui/Caches.cpp
@@ -43,7 +43,7 @@
     glBindBuffer(GL_ARRAY_BUFFER, meshBuffer);
     glBufferData(GL_ARRAY_BUFFER, sizeof(gMeshVertices), gMeshVertices, GL_STATIC_DRAW);
 
-    currentBuffer = meshBuffer;
+    mCurrentBuffer = meshBuffer;
 }
 
 /**
@@ -57,9 +57,9 @@
  * Binds the specified VBO.
  */
 void Caches::bindMeshBuffer(const GLuint buffer) {
-    if (currentBuffer != buffer) {
+    if (mCurrentBuffer != buffer) {
         glBindBuffer(GL_ARRAY_BUFFER, buffer);
-        currentBuffer = buffer;
+        mCurrentBuffer = buffer;
     }
 }
 
@@ -67,9 +67,9 @@
  * Unbinds the VBO used to render simple textured quads.
  */
 void Caches::unbindMeshBuffer() {
-    if (currentBuffer) {
+    if (mCurrentBuffer) {
         glBindBuffer(GL_ARRAY_BUFFER, 0);
-        currentBuffer = 0;
+        mCurrentBuffer = 0;
     }
 }
 
diff --git a/libs/hwui/Caches.h b/libs/hwui/Caches.h
index 79644a5..aff5366 100644
--- a/libs/hwui/Caches.h
+++ b/libs/hwui/Caches.h
@@ -79,7 +79,9 @@
 
     friend class Singleton<Caches>;
 
-    CacheLogger logger;
+    CacheLogger mlogger;
+
+    GLuint mCurrentBuffer;
 
 public:
     void bindMeshBuffer();
@@ -92,7 +94,6 @@
     Program* currentProgram;
 
     GLuint meshBuffer;
-    GLuint currentBuffer;
 
     TextureCache textureCache;
     LayerCache layerCache;
diff --git a/libs/hwui/Patch.cpp b/libs/hwui/Patch.cpp
index 253a19b..3d21431 100644
--- a/libs/hwui/Patch.cpp
+++ b/libs/hwui/Patch.cpp
@@ -26,8 +26,6 @@
 namespace android {
 namespace uirenderer {
 
-class Caches;
-
 ///////////////////////////////////////////////////////////////////////////////
 // Constructors/destructor
 ///////////////////////////////////////////////////////////////////////////////