diff --git a/softkeymaster/Android.mk b/softkeymaster/Android.mk
index 5915208..8623c2e 100644
--- a/softkeymaster/Android.mk
+++ b/softkeymaster/Android.mk
@@ -24,7 +24,6 @@
 
 LOCAL_C_INCLUDES := \
 	system/security/keystore \
-	libcore/include \
 	external/openssl/include
 
 LOCAL_C_FLAGS = -fvisibility=hidden -Wall -Werror
diff --git a/softkeymaster/keymaster_openssl.cpp b/softkeymaster/keymaster_openssl.cpp
index fb5b9d0..a5ba684 100644
--- a/softkeymaster/keymaster_openssl.cpp
+++ b/softkeymaster/keymaster_openssl.cpp
@@ -28,7 +28,7 @@
 #include <openssl/err.h>
 #include <openssl/x509.h>
 
-#include <UniquePtr.h>
+#include <utils/UniquePtr.h>
 
 // For debugging
 //#define LOG_NDEBUG 0