diff --git a/include/gui/Surface.h b/include/gui/Surface.h
index 27921df..ec75d4e 100644
--- a/include/gui/Surface.h
+++ b/include/gui/Surface.h
@@ -31,8 +31,6 @@
 #include <gui/ISurface.h>
 #include <gui/ISurfaceComposerClient.h>
 
-#define ANDROID_VIEW_SURFACE_JNI_ID    "mNativeSurface"
-
 namespace android {
 
 // ---------------------------------------------------------------------------
diff --git a/include/gui/SurfaceComposerClient.h b/include/gui/SurfaceComposerClient.h
index dbdd3a9..e0761b9 100644
--- a/include/gui/SurfaceComposerClient.h
+++ b/include/gui/SurfaceComposerClient.h
@@ -21,6 +21,7 @@
 #include <sys/types.h>
 
 #include <binder/IBinder.h>
+#include <binder/IMemory.h>
 
 #include <utils/RefBase.h>
 #include <utils/Singleton.h>