diff --git a/jni/Android.bp b/jni/Android.bp
index 984358c..2a70f1a 100755
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -16,6 +16,7 @@
 
     include_dirs: [
         "vendor/qcom/opensource/commonsys-intf/bluetooth/include",
+        "vendor/qcom/opensource/commonsys/bluetooth_ext/system_bt_ext/btconfigstore",
         "vendor/qcom/opensource/commonsys/fm/helium",
     ],
 
diff --git a/jni/android_hardware_fm.cpp b/jni/android_hardware_fm.cpp
index 972d05f..be8d2ef 100644
--- a/jni/android_hardware_fm.cpp
+++ b/jni/android_hardware_fm.cpp
@@ -41,7 +41,7 @@
 #include <dlfcn.h>
 #include "android_runtime/Log.h"
 #include "android_runtime/AndroidRuntime.h"
-#include "btcommon_interface_defs.h"
+#include "bt_configstore.h"
 #include <vector>
 #include "radio-helium.h"
 
@@ -193,6 +193,8 @@
 jmethodID method_enableSoftMuteCallback;
 jmethodID method_FmReceiverJNICtor;
 
+int load_bt_configstore_lib();
+
 static bool checkCallbackThread() {
    JNIEnv* env = AndroidRuntime::getJNIEnv();
    if (mCallbackEnv != env || mCallbackEnv == NULL)