diff --git a/drm/DrmFbImporter.cpp b/drm/DrmFbImporter.cpp
index 2b5ddd4..592fc48 100644
--- a/drm/DrmFbImporter.cpp
+++ b/drm/DrmFbImporter.cpp
@@ -19,7 +19,6 @@
 
 #include "DrmFbImporter.h"
 
-#include <gralloc_handle.h>
 #include <hardware/gralloc.h>
 #include <xf86drm.h>
 #include <xf86drmMode.h>
diff --git a/drm/DrmPlane.cpp b/drm/DrmPlane.cpp
index 5443e7e..6433fb6 100644
--- a/drm/DrmPlane.cpp
+++ b/drm/DrmPlane.cpp
@@ -231,7 +231,7 @@
     }
   }
 
-  uint32_t format = layer->buffer->format;
+  uint32_t format = layer->buffer_info.format;
   if (!IsFormatSupported(format)) {
     ALOGV("Plane %d does not supports %c%c%c%c format", id_, format,
           format >> 8, format >> 16, format >> 24);