diff --git a/recovery/gpt-utils/Android.mk b/recovery/gpt-utils/Android.mk
index aa6a0d03b..8c83b8459 100644
--- a/recovery/gpt-utils/Android.mk
+++ b/recovery/gpt-utils/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-gpt_utils_common_cflags := -Wall -Werror -Wno-unused-variable
+gpt_utils_common_cflags := -Wall -Werror
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := gpt-utils.cpp
diff --git a/recovery/gpt-utils/gpt-utils.cpp b/recovery/gpt-utils/gpt-utils.cpp
index e4651c441..7f04f42be 100644
--- a/recovery/gpt-utils/gpt-utils.cpp
+++ b/recovery/gpt-utils/gpt-utils.cpp
@@ -51,7 +51,7 @@
 #include <vector>
 #include <string>
 #define LOG_TAG "gpt-utils"
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 #include "gpt-utils.h"
 #include <endian.h>
@@ -747,7 +747,6 @@ int prepare_partitions(enum boot_update_stage stage, const char *dev_path)
     enum gpt_state gpt_prim, gpt_second;
     enum boot_update_stage internal_stage;
     struct stat xbl_partition_stat;
-    struct stat ufs_dir_stat;
 
     if (!dev_path) {
         fprintf(stderr, "%s: Invalid dev_path\n",
@@ -970,7 +969,6 @@ int add_lun_to_update_list(char *lun_path, struct update_data *dat)
 
 int prepare_boot_update(enum boot_update_stage stage)
 {
-        int r, fd;
         int is_ufs = gpt_utils_is_ufs_device();
         struct stat ufs_dir_stat;
         struct update_data data;