diff --git a/keystore/Android.mk b/keystore/Android.mk
index 8231bf1..f87675d 100644
--- a/keystore/Android.mk
+++ b/keystore/Android.mk
@@ -63,6 +63,7 @@
 	libhidltransport \
 	android.hardware.keymaster@3.0 \
 	android.system.wifi.keystore@1.0
+LOCAL_HEADER_LIBRARIES := libbase_headers
 LOCAL_MODULE := keystore
 LOCAL_MODULE_TAGS := optional
 LOCAL_INIT_RC := keystore.rc
diff --git a/keystore/include/keystore/keystore_client.h b/keystore/include/keystore/keystore_client.h
index a0593c1..2ba7fd4 100644
--- a/keystore/include/keystore/keystore_client.h
+++ b/keystore/include/keystore/keystore_client.h
@@ -19,6 +19,8 @@
 #include <string>
 #include <vector>
 
+#include <android-base/macros.h>
+
 #include "authorization_set.h"
 #include "keystore.h"
 #include "keystore_return_types.h"