diff --git a/include/hardware/copybit.h b/include/hardware/copybit.h
index 6eaa975..833aa32 100644
--- a/include/hardware/copybit.h
+++ b/include/hardware/copybit.h
@@ -103,12 +103,10 @@
     uint32_t    h;
     /* format COPYBIT_FORMAT_xxx */
     int32_t     format;
-    /* offset from base to first pixel */
-    uint32_t    offset;
     /* base of buffer with image */
-    void       *base;
-    /* file descriptor for image */
-    int         fd;
+    void        *base;
+    /* handle to the image */
+    native_handle_t* handle;
 };
 
 /* Rectangle */
diff --git a/modules/gralloc/gralloc_priv.h b/modules/gralloc/gralloc_priv.h
index 8adb4f4..7ec07ef 100644
--- a/modules/gralloc/gralloc_priv.h
+++ b/modules/gralloc/gralloc_priv.h
@@ -34,6 +34,8 @@
 
 /*****************************************************************************/
 
+struct private_module_t;
+
 inline size_t roundUpToPageSize(size_t x) {
     return (x + (PAGESIZE-1)) & ~(PAGESIZE-1);
 }