diff --git a/keystore-engine/Android.mk b/keystore-engine/Android.mk
index 989cf9a..89d3fba 100644
--- a/keystore-engine/Android.mk
+++ b/keystore-engine/Android.mk
@@ -27,7 +27,6 @@
 LOCAL_CFLAGS := -fvisibility=hidden -Wall -Werror
 
 LOCAL_C_INCLUDES += \
-	libcore/include \
 	system/security/keystore \
 	external/openssl/include
 
diff --git a/keystore-engine/eng_keystore.cpp b/keystore-engine/eng_keystore.cpp
index a202641..3514535 100644
--- a/keystore-engine/eng_keystore.cpp
+++ b/keystore-engine/eng_keystore.cpp
@@ -25,7 +25,7 @@
 
 #include <keystore.h>
 
-#include <UniquePtr.h>
+#include <utils/UniquePtr.h>
 
 #include <sys/socket.h>
 #include <stdarg.h>