diff --git a/gralloc/QtiGrallocPriv.h b/gralloc/QtiGrallocPriv.h
index 5fc2db15..40549e2c 100644
--- a/gralloc/QtiGrallocPriv.h
+++ b/gralloc/QtiGrallocPriv.h
@@ -190,12 +190,12 @@ struct private_handle_t : public native_handle_t {
 #ifdef GRALLOC_HANDLE_HAS_RESERVED_SIZE
         ,reserved_size(0)
 #endif
+#ifdef GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE
+        ,custom_content_md_reserved_size(0)
+#endif
 #ifdef GRALLOC_HANDLE_HAS_UBWCP_FORMAT
         ,linear_size(0)
         ,ubwcp_format(format)
-#endif
-#ifdef GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE
-        ,custom_content_md_reserved_size(0)
 #endif
   {
     version = static_cast<int>(sizeof(native_handle));
diff --git a/gralloc/gr_priv_handle.h b/gralloc/gr_priv_handle.h
index 1042e29f..0f7151a9 100644
--- a/gralloc/gr_priv_handle.h
+++ b/gralloc/gr_priv_handle.h
@@ -140,12 +140,12 @@ struct private_handle_t {
 #ifdef GRALLOC_HANDLE_HAS_RESERVED_SIZE
         ,reserved_size(0)
 #endif
+#ifdef GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE
+        ,custom_content_md_reserved_size(0)
+#endif
 #ifdef GRALLOC_HANDLE_HAS_UBWCP_FORMAT
         ,linear_size(0)
         ,ubwcp_format(format)
-#endif
-#ifdef GRALLOC_HANDLE_HAS_CUSTOM_CONTENT_MD_RESERVED_SIZE
-        ,custom_content_md_reserved_size(0)
 #endif
   {
     version = static_cast<int>(sizeof(native_handle));