diff --git a/cmds/flatland/GLHelper.cpp b/cmds/flatland/GLHelper.cpp
index 3647897..4f7697f 100644
--- a/cmds/flatland/GLHelper.cpp
+++ b/cmds/flatland/GLHelper.cpp
@@ -205,7 +205,7 @@
     glc->setDefaultMaxBufferCount(3);
     glc->setConsumerUsageBits(GRALLOC_USAGE_HW_COMPOSER);
 
-    sp<ANativeWindow> anw = new SurfaceTextureClient(bq);
+    sp<ANativeWindow> anw = new Surface(bq);
     EGLSurface s = eglCreateWindowSurface(mDisplay, mConfig, anw.get(), NULL);
     if (s == EGL_NO_SURFACE) {
         fprintf(stderr, "eglCreateWindowSurface error: %#x\n", eglGetError());
diff --git a/cmds/flatland/GLHelper.h b/cmds/flatland/GLHelper.h
index 19fdff9..7341374 100644
--- a/cmds/flatland/GLHelper.h
+++ b/cmds/flatland/GLHelper.h
@@ -16,7 +16,7 @@
 
 #include <gui/GraphicBufferAlloc.h>
 #include <gui/GLConsumer.h>
-#include <gui/SurfaceTextureClient.h>
+#include <gui/Surface.h>
 
 #include <EGL/egl.h>
 #include <GLES2/gl2.h>
diff --git a/cmds/flatland/Main.cpp b/cmds/flatland/Main.cpp
index 45f414e..a65052e 100644
--- a/cmds/flatland/Main.cpp
+++ b/cmds/flatland/Main.cpp
@@ -19,7 +19,7 @@
 #include <gui/GraphicBufferAlloc.h>
 #include <gui/Surface.h>
 #include <gui/GLConsumer.h>
-#include <gui/SurfaceTextureClient.h>
+#include <gui/Surface.h>
 #include <ui/Fence.h>
 #include <utils/Trace.h>