diff --git a/libshims/Android.mk b/libshims/Android.mk
index d3f243f..c7968a4 100644
--- a/libshims/Android.mk
+++ b/libshims/Android.mk
@@ -16,7 +16,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := libqsap_shim.c
-LOCAL_SHARED_LIBRARIES := libqsap_sdk liblog
+LOCAL_SHARED_LIBRARIES := libqsap_sdk liblog libcutils libutils
 LOCAL_C_INCLUDES := $(TOP)/system/qcom/softap/sdk
 LOCAL_MODULE := libqsap_shim
 LOCAL_MODULE_TAGS := optional
diff --git a/libshims/libqsap_shim.c b/libshims/libqsap_shim.c
index 6ea8e62..69d47ce 100644
--- a/libshims/libqsap_shim.c
+++ b/libshims/libqsap_shim.c
@@ -1,9 +1,15 @@
 #include "qsap_api.h"
 
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
 #include <sys/socket.h>
+#include <sys/ioctl.h>
 #include <linux/wireless.h>
 
-#include "cutils/log.h"
+#include "log/log.h"
 
 // Keep in sync with system/qcom/softap/sdk/qsap_api.c
 struct Command qsap_str[eSTR_LAST] = {