diff --git a/libshims/Android.mk b/libshims/Android.mk
index c7968a4..c93bf06 100644
--- a/libshims/Android.mk
+++ b/libshims/Android.mk
@@ -18,6 +18,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := libqsap_shim.c
 LOCAL_SHARED_LIBRARIES := libqsap_sdk liblog libcutils libutils
 LOCAL_C_INCLUDES := $(TOP)/system/qcom/softap/sdk
+LOCAL_C_FLAGS := -Wno-error
+LOCAL_HEADER_LIBRARIES := libutils_headers
 LOCAL_MODULE := libqsap_shim
 LOCAL_MODULE_TAGS := optional
 LOCAL_PROPRIETARY_MODULE := true
diff --git a/libshims/libqsap_shim.c b/libshims/libqsap_shim.c
index 69d47ce..db67b47 100644
--- a/libshims/libqsap_shim.c
+++ b/libshims/libqsap_shim.c
@@ -9,7 +9,7 @@
 #include <sys/ioctl.h>
 #include <linux/wireless.h>
 
-#include "log/log.h"
+#include <log/log.h>
 
 // Keep in sync with system/qcom/softap/sdk/qsap_api.c
 struct Command qsap_str[eSTR_LAST] = {