diff --git a/keystore/Android.mk b/keystore/Android.mk
index c6b65da..8231bf1 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -57,8 +57,7 @@
 	libselinux \
 	libsoftkeymasterdevice \
 	libkeymaster_messages \
-	libkeymaster_portable \
-	libkeymaster \
+	libkeymaster1 \
 	libhwbinder \
 	libhidlbase \
 	libhidltransport \
diff --git a/keystore/keystore_utils.cpp b/keystore/keystore_utils.cpp
index b1777d0..0d3f0ec 100644
--- a/keystore/keystore_utils.cpp
+++ b/keystore/keystore_utils.cpp
@@ -25,6 +25,7 @@
 #include <cutils/log.h>
 #include <private/android_filesystem_config.h>
 
+#include <keymaster/android_keymaster_utils.h>
 #include <keystore/authorization_set.h>
 #include <keystore/keystore_client.h>
 #include <keystore/IKeystoreService.h>