diff --git a/jni/com_android_bluetooth_avrcp_target.cpp b/jni/com_android_bluetooth_avrcp_target.cpp
index 08b605f..214feeb 100644
--- a/jni/com_android_bluetooth_avrcp_target.cpp
+++ b/jni/com_android_bluetooth_avrcp_target.cpp
@@ -17,6 +17,7 @@
 #define LOG_TAG "AvrcpTargetJni"
 
 #include <base/bind.h>
+#include <base/callback.h>
 #include <map>
 #include <mutex>
 #include <shared_mutex>
diff --git a/jni/com_android_bluetooth_gatt.cpp b/jni/com_android_bluetooth_gatt.cpp
index 86e667b..4521515 100644
--- a/jni/com_android_bluetooth_gatt.cpp
+++ b/jni/com_android_bluetooth_gatt.cpp
@@ -24,6 +24,7 @@
 #include "utils/Log.h"
 
 #include <base/bind.h>
+#include <base/callback.h>
 #include <string.h>
 #include <array>
 #include <memory>
diff --git a/src/com/android/bluetooth/hearingaid/HearingAidService.java b/src/com/android/bluetooth/hearingaid/HearingAidService.java
index bf2f556..a34f344 100644
--- a/src/com/android/bluetooth/hearingaid/HearingAidService.java
+++ b/src/com/android/bluetooth/hearingaid/HearingAidService.java
@@ -50,7 +50,7 @@
  * @hide
  */
 public class HearingAidService extends ProfileService {
-    private static final boolean DBG = false;
+    private static final boolean DBG = true;
     private static final String TAG = "HearingAidService";
 
     // Upper limit of all HearingAid devices: Bonded or Connected