summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Georg Neis <neis@chromium.org> 2023-01-26 07:38:15 +0000
committer Abhishek Pandit-Subedi <abhishekpandit@google.com> 2023-02-06 15:38:53 -0800
commit4a65e27d0f24f81c745bdfacb2999cd2e49ca044 (patch)
tree15801c7629d3d286eff2be2a0d0461d1cf5f083e
parentc22c7ec29da886d1c41c5fff10f15a4a3903d407 (diff)
Update {bind,callback,callback_forward,callback_helpers}.h includes
These headers are now in base/functional/. Bug: 266161904 Tag: #floss Test: ./floss/build/build-in-container.py and emerge floss Change-Id: Iaac7673f7c61d55e2d1572c92799d670fef65e72
-rw-r--r--android/app/jni/com_android_bluetooth_avrcp_target.cpp4
-rw-r--r--android/app/jni/com_android_bluetooth_gatt.cpp4
-rw-r--r--system/bta/ag/bta_ag_api.cc2
-rw-r--r--system/bta/ag/bta_ag_rfc.cc2
-rw-r--r--system/bta/ag/bta_ag_sco.cc2
-rw-r--r--system/bta/ag/bta_ag_sdp.cc2
-rw-r--r--system/bta/csis/csis_client.cc4
-rw-r--r--system/bta/csis/csis_client_test.cc2
-rw-r--r--system/bta/dm/bta_dm_api.cc2
-rw-r--r--system/bta/dm/bta_dm_ci.cc2
-rw-r--r--system/bta/dm/bta_dm_pm.cc2
-rw-r--r--system/bta/gatt/bta_gattc_act.cc2
-rw-r--r--system/bta/gatt/bta_gattc_api.cc2
-rw-r--r--system/bta/gatt/bta_gatts_api.cc2
-rw-r--r--system/bta/has/has_client.cc4
-rw-r--r--system/bta/has/has_client_test.cc2
-rw-r--r--system/bta/hearing_aid/hearing_aid.cc4
-rw-r--r--system/bta/hh/bta_hh_le.cc4
-rw-r--r--system/bta/include/bta_api.h2
-rw-r--r--system/bta/include/bta_csis_api.h2
-rw-r--r--system/bta/include/bta_gatt_api.h2
-rw-r--r--system/bta/include/bta_has_api.h2
-rw-r--r--system/bta/include/bta_hearing_aid_api.h2
-rw-r--r--system/bta/include/bta_le_audio_api.h6
-rw-r--r--system/bta/jv/bta_jv_api.cc2
-rw-r--r--system/bta/le_audio/broadcaster/broadcaster.cc2
-rw-r--r--system/bta/le_audio/broadcaster/mock_ble_advertising_manager.h4
-rw-r--r--system/bta/le_audio/broadcaster/state_machine.cc4
-rw-r--r--system/bta/le_audio/broadcaster/state_machine.h2
-rw-r--r--system/bta/le_audio/client.cc2
-rw-r--r--system/bta/le_audio/client_linux.cc2
-rw-r--r--system/bta/le_audio/state_machine.cc4
-rw-r--r--system/bta/sdp/bta_sdp_api.cc2
-rw-r--r--system/bta/sys/bta_sys_main.cc2
-rw-r--r--system/bta/test/bta_api_test.cc2
-rw-r--r--system/bta/test/bta_av_test.cc2
-rw-r--r--system/bta/test/bta_dm_test.cc2
-rw-r--r--system/bta/test/common/bta_dm_api_mock.h2
-rw-r--r--system/bta/test/common/bta_gatt_api_mock.h2
-rw-r--r--system/bta/test/common/mock_controller.h2
-rw-r--r--system/bta/vc/vc.cc2
-rw-r--r--system/bta/vc/vc_test.cc2
-rw-r--r--system/btif/avrcp/avrcp_service.cc2
-rw-r--r--system/btif/include/btif_common.h2
-rw-r--r--system/btif/src/btif_a2dp_sink.cc2
-rw-r--r--system/btif/src/btif_av.cc2
-rw-r--r--system/btif/src/btif_ble_advertiser.cc2
-rw-r--r--system/btif/src/btif_ble_scanner.cc2
-rw-r--r--system/btif/src/btif_core.cc2
-rw-r--r--system/btif/src/btif_csis_client.cc2
-rw-r--r--system/btif/src/btif_dm.cc2
-rw-r--r--system/btif/src/btif_gatt_client.cc2
-rw-r--r--system/btif/src/btif_gatt_server.cc2
-rw-r--r--system/btif/src/btif_has_client.cc2
-rw-r--r--system/btif/src/btif_hearing_aid.cc2
-rw-r--r--system/btif/src/btif_hf.cc2
-rw-r--r--system/btif/src/btif_keystore.cc2
-rw-r--r--system/btif/src/btif_le_audio_broadcaster.cc2
-rw-r--r--system/btif/src/btif_pan.cc2
-rw-r--r--system/btif/src/btif_profile_queue.cc4
-rw-r--r--system/btif/src/btif_sock.cc2
-rw-r--r--system/btif/src/btif_vc.cc2
-rw-r--r--system/btif/test/btif_profile_queue_test.cc4
-rw-r--r--system/common/base_bind_unittest.cc4
-rw-r--r--system/common/benchmark/thread_performance_benchmark.cc2
-rw-r--r--system/common/benchmark/timer_performance_benchmark.cc2
-rw-r--r--system/common/message_loop_thread.h2
-rw-r--r--system/common/message_loop_thread_unittest.cc2
-rw-r--r--system/common/once_timer.h2
-rw-r--r--system/common/once_timer_unittest.cc2
-rw-r--r--system/common/repeating_timer.cc2
-rw-r--r--system/common/repeating_timer.h2
-rw-r--r--system/common/repeating_timer_unittest.cc2
-rw-r--r--system/common/test/thread_performance_test.cc2
-rw-r--r--system/device/include/controller.h2
-rw-r--r--system/gd/common/bind.h2
-rw-r--r--system/gd/common/callback.h2
-rw-r--r--system/gd/rust/shim/callbacks/callbacks.h2
-rw-r--r--system/gd/rust/topshim/btav/btav_shim.cc2
-rw-r--r--system/gd/rust/topshim/gatt/gatt_ble_advertiser_shim.cc4
-rw-r--r--system/gd/rust/topshim/gatt/gatt_ble_scanner_shim.cc4
-rw-r--r--system/gd/rust/topshim/gatt/gatt_shim.cc4
-rw-r--r--system/hci/include/hci_layer.h2
-rw-r--r--system/include/bind_helpers.h2
-rw-r--r--system/include/hardware/avrcp/avrcp.h2
-rw-r--r--system/include/hardware/ble_advertiser.h2
-rw-r--r--system/include/hardware/bluetooth.h2
-rw-r--r--system/main/shim/btm_api.cc2
-rw-r--r--system/main/shim/btm_api.h2
-rw-r--r--system/main/shim/hci_layer.cc2
-rw-r--r--system/main/shim/le_scanning_manager.cc2
-rw-r--r--system/profile/avrcp/connection_handler.cc2
-rw-r--r--system/profile/avrcp/connection_handler.h2
-rw-r--r--system/profile/avrcp/device.h2
-rw-r--r--system/profile/avrcp/tests/avrcp_connection_handler_test.cc2
-rw-r--r--system/profile/avrcp/tests/avrcp_device_test.cc2
-rw-r--r--system/service/example/heart_rate/heart_rate_server.cc2
-rw-r--r--system/service/example/heart_rate/server_main.cc2
-rw-r--r--system/service/gatt_server_old.cc4
-rw-r--r--system/service/ipc/binder/ipc_handler_binder.cc2
-rw-r--r--system/service/ipc/dbus/ipc_handler_dbus.cc2
-rw-r--r--system/service/ipc/ipc_handler_linux.cc2
-rw-r--r--system/service/low_energy_advertiser.cc4
-rw-r--r--system/service/low_energy_scanner.cc4
-rw-r--r--system/stack/btm/ble_advertiser_hci_interface.cc4
-rw-r--r--system/stack/btm/ble_advertiser_hci_interface.h2
-rw-r--r--system/stack/btm/ble_scanner_hci_interface.cc2
-rw-r--r--system/stack/btm/ble_scanner_hci_interface.h2
-rw-r--r--system/stack/btm/btm_ble_addr.cc2
-rw-r--r--system/stack/btm/btm_ble_adv_filter.cc2
-rw-r--r--system/stack/btm/btm_ble_batchscan.cc2
-rw-r--r--system/stack/btm/btm_ble_bgconn.cc2
-rw-r--r--system/stack/btm/btm_ble_gap.cc2
-rw-r--r--system/stack/btm/btm_ble_multi_adv.cc2
-rw-r--r--system/stack/btm/btm_iso_impl.h4
-rw-r--r--system/stack/btu/btu_hcif.cc2
-rw-r--r--system/stack/btu/btu_task.cc2
-rw-r--r--system/stack/gatt/connection_manager.cc4
-rw-r--r--system/stack/gatt/gatt_attr.cc2
-rw-r--r--system/stack/gatt/gatt_int.h2
-rw-r--r--system/stack/hcic/hciblecmds.cc2
-rw-r--r--system/stack/hcic/hcicmds.cc2
-rw-r--r--system/stack/hid/hidd_conn.cc2
-rw-r--r--system/stack/hid/hidh_conn.cc2
-rw-r--r--system/stack/include/avrc_api.h2
-rw-r--r--system/stack/include/ble_advertiser.h2
-rw-r--r--system/stack/include/ble_scanner.h2
-rw-r--r--system/stack/include/btm_ble_api.h2
-rw-r--r--system/stack/include/btm_ble_api_types.h2
-rw-r--r--system/stack/include/btu.h2
-rw-r--r--system/stack/include/hcimsgs.h2
-rwxr-xr-xsystem/stack/l2cap/l2c_csm.cc2
-rw-r--r--system/stack/rfcomm/port_rfc.cc2
-rw-r--r--system/stack/smp/smp_keys.cc4
-rw-r--r--system/stack/test/common/mock_controller.h2
-rw-r--r--system/stack/test/common/mock_hcic_layer.h2
-rw-r--r--system/stack/test/gatt_connection_manager_test.cc4
-rw-r--r--system/test/common/jni_thread.cc2
-rw-r--r--system/test/common/jni_thread.h2
-rw-r--r--system/test/common/main_handler.cc4
-rw-r--r--system/test/common/main_handler.h2
-rw-r--r--system/test/mock/mock_bta_ag_api.cc2
-rw-r--r--system/test/mock/mock_bta_csis.cc2
-rw-r--r--system/test/mock/mock_bta_dm_api.h2
-rw-r--r--system/test/mock/mock_bta_gattc_api.cc4
-rw-r--r--system/test/mock/mock_bta_gatts_api.cc4
-rw-r--r--system/test/mock/mock_bta_has.cc2
-rw-r--r--system/test/mock/mock_bta_hearing_aid.cc4
-rw-r--r--system/test/mock/mock_bta_jv_api.cc2
-rw-r--r--system/test/mock/mock_bta_leaudio.cc2
-rw-r--r--system/test/mock/mock_bta_leaudio_broadcaster.cc2
-rw-r--r--system/test/mock/mock_bta_sdp_api.cc2
-rw-r--r--system/test/mock/mock_bta_sys_main.h2
-rw-r--r--system/test/mock/mock_bta_vc.cc2
-rw-r--r--system/test/mock/mock_btif_avrcp_service.h2
-rw-r--r--system/test/mock/mock_btif_core.cc2
-rw-r--r--system/test/mock/mock_btif_profile_queue.h4
-rw-r--r--system/test/mock/mock_btu_task.cc2
-rw-r--r--system/test/mock/mock_legacy_hci_iterface.cc2
-rw-r--r--system/test/mock/mock_main_shim_btm_api.cc6
-rw-r--r--system/test/mock/mock_stack_btm_ble_addr.h2
-rw-r--r--system/test/mock/mock_stack_btm_ble_adv_filter.cc2
-rw-r--r--system/test/mock/mock_stack_btm_ble_batchscan.cc4
-rw-r--r--system/test/mock/mock_stack_btm_ble_bgconn.h2
-rw-r--r--system/test/mock/mock_stack_btm_ble_gap.cc2
-rw-r--r--system/test/mock/mock_stack_btm_ble_multi_adv.cc2
-rw-r--r--system/test/mock/mock_stack_btm_ble_scanner.cc4
-rw-r--r--system/test/mock/mock_stack_btu_hcif.cc4
-rw-r--r--system/test/mock/mock_stack_gatt_attr.cc2
-rw-r--r--system/test/mock/mock_stack_gatt_connection_manager.cc4
-rw-r--r--system/test/mock/mock_stack_hcic_hciblecmds.h2
-rw-r--r--system/test/mock/mock_stack_hcic_hcicmds.h2
172 files changed, 208 insertions, 208 deletions
diff --git a/android/app/jni/com_android_bluetooth_avrcp_target.cpp b/android/app/jni/com_android_bluetooth_avrcp_target.cpp
index fb8c56086d..8f0ec95ce3 100644
--- a/android/app/jni/com_android_bluetooth_avrcp_target.cpp
+++ b/android/app/jni/com_android_bluetooth_avrcp_target.cpp
@@ -16,8 +16,8 @@
#define LOG_TAG "AvrcpTargetJni"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <map>
#include <mutex>
#include <shared_mutex>
diff --git a/android/app/jni/com_android_bluetooth_gatt.cpp b/android/app/jni/com_android_bluetooth_gatt.cpp
index d80bdbe443..5eff0105ac 100644
--- a/android/app/jni/com_android_bluetooth_gatt.cpp
+++ b/android/app/jni/com_android_bluetooth_gatt.cpp
@@ -16,8 +16,8 @@
#define LOG_TAG "BtGatt.JNI"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <cutils/log.h>
#include <string.h>
diff --git a/system/bta/ag/bta_ag_api.cc b/system/bta/ag/bta_ag_api.cc
index d012d77a66..7a0b51266f 100644
--- a/system/bta/ag/bta_ag_api.cc
+++ b/system/bta/ag/bta_ag_api.cc
@@ -26,7 +26,7 @@
#include "bta/include/bta_ag_api.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <cstdint>
diff --git a/system/bta/ag/bta_ag_rfc.cc b/system/bta/ag/bta_ag_rfc.cc
index 7d08e25bfc..58ed5e968f 100644
--- a/system/bta/ag/bta_ag_rfc.cc
+++ b/system/bta/ag/bta_ag_rfc.cc
@@ -23,7 +23,7 @@
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <cstring>
diff --git a/system/bta/ag/bta_ag_sco.cc b/system/bta/ag/bta_ag_sco.cc
index a2e4ac2031..8595778779 100644
--- a/system/bta/ag/bta_ag_sco.cc
+++ b/system/bta/ag/bta_ag_sco.cc
@@ -22,7 +22,7 @@
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <cstdint>
diff --git a/system/bta/ag/bta_ag_sdp.cc b/system/bta/ag/bta_ag_sdp.cc
index c199c0809f..9455dadf5f 100644
--- a/system/bta/ag/bta_ag_sdp.cc
+++ b/system/bta/ag/bta_ag_sdp.cc
@@ -23,7 +23,7 @@
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
diff --git a/system/bta/csis/csis_client.cc b/system/bta/csis/csis_client.cc
index fd6246d9f4..7d62d5b603 100644
--- a/system/bta/csis/csis_client.cc
+++ b/system/bta/csis/csis_client.cc
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include <base/strings/string_number_conversions.h>
#include <hardware/bt_csis.h>
diff --git a/system/bta/csis/csis_client_test.cc b/system/bta/csis/csis_client_test.cc
index 1c36d05288..43ca9b49a7 100644
--- a/system/bta/csis/csis_client_test.cc
+++ b/system/bta/csis/csis_client_test.cc
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/system/bta/dm/bta_dm_api.cc b/system/bta/dm/bta_dm_api.cc
index c9076dedd8..a4c7627356 100644
--- a/system/bta/dm/bta_dm_api.cc
+++ b/system/bta/dm/bta_dm_api.cc
@@ -22,7 +22,7 @@
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <vector>
diff --git a/system/bta/dm/bta_dm_ci.cc b/system/bta/dm/bta_dm_ci.cc
index ea815247aa..6fc4242bb4 100644
--- a/system/bta/dm/bta_dm_ci.cc
+++ b/system/bta/dm/bta_dm_ci.cc
@@ -21,7 +21,7 @@
* This is the API implementation file for the BTA device manager.
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <memory>
#include "bta/dm/bta_dm_int.h"
diff --git a/system/bta/dm/bta_dm_pm.cc b/system/bta/dm/bta_dm_pm.cc
index 7e28f08187..07126bf7da 100644
--- a/system/bta/dm/bta_dm_pm.cc
+++ b/system/bta/dm/bta_dm_pm.cc
@@ -23,7 +23,7 @@
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <cstdint>
#include <mutex>
diff --git a/system/bta/gatt/bta_gattc_act.cc b/system/bta/gatt/bta_gattc_act.cc
index 9b4b092504..4590090fae 100644
--- a/system/bta/gatt/bta_gattc_act.cc
+++ b/system/bta/gatt/bta_gattc_act.cc
@@ -25,7 +25,7 @@
#define LOG_TAG "bt_bta_gattc"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/strings/stringprintf.h>
diff --git a/system/bta/gatt/bta_gattc_api.cc b/system/bta/gatt/bta_gattc_api.cc
index 93d02f212f..f602191976 100644
--- a/system/bta/gatt/bta_gattc_api.cc
+++ b/system/bta/gatt/bta_gattc_api.cc
@@ -24,7 +24,7 @@
#define LOG_TAG "bta_gattc_api"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <ios>
diff --git a/system/bta/gatt/bta_gatts_api.cc b/system/bta/gatt/bta_gatts_api.cc
index 0de36dbd14..9af1ed7dcd 100644
--- a/system/bta/gatt/bta_gatts_api.cc
+++ b/system/bta/gatt/bta_gatts_api.cc
@@ -22,7 +22,7 @@
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
diff --git a/system/bta/has/has_client.cc b/system/bta/has/has_client.cc
index 0d88ef2ba7..d01accf412 100644
--- a/system/bta/has/has_client.cc
+++ b/system/bta/has/has_client.cc
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include <base/strings/string_number_conversions.h>
#include <hardware/bt_gatt_types.h>
diff --git a/system/bta/has/has_client_test.cc b/system/bta/has/has_client_test.cc
index a1c77bca77..0b28ff555c 100644
--- a/system/bta/has/has_client_test.cc
+++ b/system/bta/has/has_client_test.cc
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#include <base/bind.h>
#include <base/bind_helpers.h>
+#include <base/functional/bind.h>
#include <base/strings/string_number_conversions.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/system/bta/hearing_aid/hearing_aid.cc b/system/bta/hearing_aid/hearing_aid.cc
index 2315679209..ca8fcd6225 100644
--- a/system/bta/hearing_aid/hearing_aid.cc
+++ b/system/bta/hearing_aid/hearing_aid.cc
@@ -20,8 +20,8 @@
#define LOG_TAG "bluetooth"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include <base/strings/string_number_conversions.h> // HexEncode
diff --git a/system/bta/hh/bta_hh_le.cc b/system/bta/hh/bta_hh_le.cc
index 2c9df69d7b..8c04a5b5e0 100644
--- a/system/bta/hh/bta_hh_le.cc
+++ b/system/bta/hh/bta_hh_le.cc
@@ -18,8 +18,8 @@
#define LOG_TAG "bt_bta_hh"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <cstdint>
#include <vector>
diff --git a/system/bta/include/bta_api.h b/system/bta/include/bta_api.h
index c17c516b49..a28dfec618 100644
--- a/system/bta/include/bta_api.h
+++ b/system/bta/include/bta_api.h
@@ -26,7 +26,7 @@
#define BTA_API_H
#include <base/strings/stringprintf.h>
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <cstdint>
#include <vector>
diff --git a/system/bta/include/bta_csis_api.h b/system/bta/include/bta_csis_api.h
index 44dca04ff1..6ed5bb41e5 100644
--- a/system/bta/include/bta_csis_api.h
+++ b/system/bta/include/bta_csis_api.h
@@ -16,7 +16,7 @@
*/
#pragma once
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "bind_helpers.h"
#include "bta/include/bta_groups.h"
#include "hardware/bt_csis.h"
diff --git a/system/bta/include/bta_gatt_api.h b/system/bta/include/bta_gatt_api.h
index 1a38936778..54ab6401d3 100644
--- a/system/bta/include/bta_gatt_api.h
+++ b/system/bta/include/bta_gatt_api.h
@@ -25,7 +25,7 @@
#ifndef BTA_GATT_API_H
#define BTA_GATT_API_H
-#include <base/callback_forward.h>
+#include <base/functional/callback_forward.h>
#include <base/strings/stringprintf.h>
#include <list>
diff --git a/system/bta/include/bta_has_api.h b/system/bta/include/bta_has_api.h
index ae9cc5255a..cd5c5c2150 100644
--- a/system/bta/include/bta_has_api.h
+++ b/system/bta/include/bta_has_api.h
@@ -17,7 +17,7 @@
#pragma once
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <string>
diff --git a/system/bta/include/bta_hearing_aid_api.h b/system/bta/include/bta_hearing_aid_api.h
index d1b930bbb2..a79fb7c262 100644
--- a/system/bta/include/bta_hearing_aid_api.h
+++ b/system/bta/include/bta_hearing_aid_api.h
@@ -18,7 +18,7 @@
#pragma once
-#include <base/callback_forward.h>
+#include <base/functional/callback_forward.h>
#include <hardware/bt_hearing_aid.h>
#include <cstdint>
diff --git a/system/bta/include/bta_le_audio_api.h b/system/bta/include/bta_le_audio_api.h
index 5a9950f182..948ec00ed1 100644
--- a/system/bta/include/bta_le_audio_api.h
+++ b/system/bta/include/bta_le_audio_api.h
@@ -17,9 +17,9 @@
#pragma once
-#include <base/bind.h>
-#include <base/callback.h>
-#include <base/callback_forward.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
+#include <base/functional/callback_forward.h>
#include <hardware/bt_le_audio.h>
#include <vector>
diff --git a/system/bta/jv/bta_jv_api.cc b/system/bta/jv/bta_jv_api.cc
index 8d14591974..2c1df7a314 100644
--- a/system/bta/jv/bta_jv_api.cc
+++ b/system/bta/jv/bta_jv_api.cc
@@ -23,7 +23,7 @@
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
diff --git a/system/bta/le_audio/broadcaster/broadcaster.cc b/system/bta/le_audio/broadcaster/broadcaster.cc
index a0d4562b86..c0c7077f20 100644
--- a/system/bta/le_audio/broadcaster/broadcaster.cc
+++ b/system/bta/le_audio/broadcaster/broadcaster.cc
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include "bta/include/bta_le_audio_api.h"
#include "bta/include/bta_le_audio_broadcaster_api.h"
diff --git a/system/bta/le_audio/broadcaster/mock_ble_advertising_manager.h b/system/bta/le_audio/broadcaster/mock_ble_advertising_manager.h
index 1bfcaf3536..0dfae21207 100644
--- a/system/bta/le_audio/broadcaster/mock_ble_advertising_manager.h
+++ b/system/bta/le_audio/broadcaster/mock_ble_advertising_manager.h
@@ -17,8 +17,8 @@
#pragma once
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/memory/weak_ptr.h>
#include <gmock/gmock.h>
diff --git a/system/bta/le_audio/broadcaster/state_machine.cc b/system/bta/le_audio/broadcaster/state_machine.cc
index 2b8eae5416..2425270533 100644
--- a/system/bta/le_audio/broadcaster/state_machine.cc
+++ b/system/bta/le_audio/broadcaster/state_machine.cc
@@ -22,8 +22,8 @@
#include <functional>
#include <iostream>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "bta/le_audio/broadcaster/broadcaster_types.h"
#include "bta/le_audio/le_audio_types.h"
diff --git a/system/bta/le_audio/broadcaster/state_machine.h b/system/bta/le_audio/broadcaster/state_machine.h
index e4d8eff835..422cc079fb 100644
--- a/system/bta/le_audio/broadcaster/state_machine.h
+++ b/system/bta/le_audio/broadcaster/state_machine.h
@@ -22,7 +22,7 @@
#include <optional>
#include <type_traits>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "broadcaster_types.h"
#include "bta_le_audio_broadcaster_api.h"
diff --git a/system/bta/le_audio/client.cc b/system/bta/le_audio/client.cc
index 984d9c5ed6..482478ed09 100644
--- a/system/bta/le_audio/client.cc
+++ b/system/bta/le_audio/client.cc
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/strings/string_number_conversions.h>
#include <deque>
diff --git a/system/bta/le_audio/client_linux.cc b/system/bta/le_audio/client_linux.cc
index 13f45633a4..4cc133f1e5 100644
--- a/system/bta/le_audio/client_linux.cc
+++ b/system/bta/le_audio/client_linux.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include "bta_le_audio_api.h"
diff --git a/system/bta/le_audio/state_machine.cc b/system/bta/le_audio/state_machine.cc
index 8ae32e12b6..fb90370168 100644
--- a/system/bta/le_audio/state_machine.cc
+++ b/system/bta/le_audio/state_machine.cc
@@ -17,8 +17,8 @@
#include "state_machine.h"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <map>
diff --git a/system/bta/sdp/bta_sdp_api.cc b/system/bta/sdp/bta_sdp_api.cc
index 9ce3009899..a7e88d32e9 100644
--- a/system/bta/sdp/bta_sdp_api.cc
+++ b/system/bta/sdp/bta_sdp_api.cc
@@ -24,7 +24,7 @@
#include "bta/include/bta_sdp_api.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include "bt_target.h" // Must be first to define build configuration
diff --git a/system/bta/sys/bta_sys_main.cc b/system/bta/sys/bta_sys_main.cc
index e5f447298d..98f3a31b3e 100644
--- a/system/bta/sys/bta_sys_main.cc
+++ b/system/bta/sys/bta_sys_main.cc
@@ -24,7 +24,7 @@
#define LOG_TAG "bt_bta_sys_main"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <cstring>
diff --git a/system/bta/test/bta_api_test.cc b/system/bta/test/bta_api_test.cc
index 327d253de3..38134f5e48 100644
--- a/system/bta/test/bta_api_test.cc
+++ b/system/bta/test/bta_api_test.cc
@@ -16,7 +16,7 @@
#include "bta/include/bta_api.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <gtest/gtest.h>
diff --git a/system/bta/test/bta_av_test.cc b/system/bta/test/bta_av_test.cc
index cc56cc1005..617cf5c0fa 100644
--- a/system/bta/test/bta_av_test.cc
+++ b/system/bta/test/bta_av_test.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <gtest/gtest.h>
diff --git a/system/bta/test/bta_dm_test.cc b/system/bta/test/bta_dm_test.cc
index c2b28a6e67..03afe6d350 100644
--- a/system/bta/test/bta_dm_test.cc
+++ b/system/bta/test/bta_dm_test.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <gtest/gtest.h>
diff --git a/system/bta/test/common/bta_dm_api_mock.h b/system/bta/test/common/bta_dm_api_mock.h
index 0139aa78d6..9be98faaca 100644
--- a/system/bta/test/common/bta_dm_api_mock.h
+++ b/system/bta/test/common/bta_dm_api_mock.h
@@ -16,7 +16,7 @@
*/
#pragma once
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <gmock/gmock.h>
#include "bta_api.h"
diff --git a/system/bta/test/common/bta_gatt_api_mock.h b/system/bta/test/common/bta_gatt_api_mock.h
index 1ea43ff769..f097236f9a 100644
--- a/system/bta/test/common/bta_gatt_api_mock.h
+++ b/system/bta/test/common/bta_gatt_api_mock.h
@@ -16,7 +16,7 @@
*/
#pragma once
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <gmock/gmock.h>
#include "bta_gatt_api.h"
diff --git a/system/bta/test/common/mock_controller.h b/system/bta/test/common/mock_controller.h
index 89958e6230..6d27a18e72 100644
--- a/system/bta/test/common/mock_controller.h
+++ b/system/bta/test/common/mock_controller.h
@@ -16,7 +16,7 @@
*/
#pragma once
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <gmock/gmock.h>
#include "hcimsgs.h"
diff --git a/system/bta/vc/vc.cc b/system/bta/vc/vc.cc
index 8eaa3399e1..bbc4da697d 100644
--- a/system/bta/vc/vc.cc
+++ b/system/bta/vc/vc.cc
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_util.h>
diff --git a/system/bta/vc/vc_test.cc b/system/bta/vc/vc_test.cc
index f2c4cbbfed..82d6217b05 100644
--- a/system/bta/vc/vc_test.cc
+++ b/system/bta/vc/vc_test.cc
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/system/btif/avrcp/avrcp_service.cc b/system/btif/avrcp/avrcp_service.cc
index 24178fe5c9..b6e80d205d 100644
--- a/system/btif/avrcp/avrcp_service.cc
+++ b/system/btif/avrcp/avrcp_service.cc
@@ -16,7 +16,7 @@
#include "avrcp_service.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/task/cancelable_task_tracker.h>
#include <base/threading/thread.h>
diff --git a/system/btif/include/btif_common.h b/system/btif/include/btif_common.h
index 57219d7759..187e0a04c2 100644
--- a/system/btif/include/btif_common.h
+++ b/system/btif/include/btif_common.h
@@ -20,7 +20,7 @@
#ifndef BTIF_COMMON_H
#define BTIF_COMMON_H
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <hardware/bluetooth.h>
#include <stdlib.h>
diff --git a/system/btif/src/btif_a2dp_sink.cc b/system/btif/src/btif_a2dp_sink.cc
index f0a85a8c03..1de5ec3704 100644
--- a/system/btif/src/btif_a2dp_sink.cc
+++ b/system/btif/src/btif_a2dp_sink.cc
@@ -21,7 +21,7 @@
#include "btif/include/btif_a2dp_sink.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <atomic>
diff --git a/system/btif/src/btif_av.cc b/system/btif/src/btif_av.cc
index 9b0360405f..4a5065d759 100644
--- a/system/btif/src/btif_av.cc
+++ b/system/btif/src/btif_av.cc
@@ -20,7 +20,7 @@
#include "btif/include/btif_av.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/strings/stringprintf.h>
#include <frameworks/proto_logging/stats/enums/bluetooth/a2dp/enums.pb.h>
diff --git a/system/btif/src/btif_ble_advertiser.cc b/system/btif/src/btif_ble_advertiser.cc
index 8e6d07bf70..c86d95649a 100644
--- a/system/btif/src/btif_ble_advertiser.cc
+++ b/system/btif/src/btif_ble_advertiser.cc
@@ -21,7 +21,7 @@
#include <hardware/bluetooth.h>
#include <hardware/bt_gatt.h>
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <vector>
diff --git a/system/btif/src/btif_ble_scanner.cc b/system/btif/src/btif_ble_scanner.cc
index 80161dba2e..086fba34a2 100644
--- a/system/btif/src/btif_ble_scanner.cc
+++ b/system/btif/src/btif_ble_scanner.cc
@@ -18,7 +18,7 @@
#define LOG_TAG "bt_btif_scanner"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/threading/thread.h>
#include <errno.h>
#include <hardware/bluetooth.h>
diff --git a/system/btif/src/btif_core.cc b/system/btif/src/btif_core.cc
index 764d488753..792afd062a 100644
--- a/system/btif/src/btif_core.cc
+++ b/system/btif/src/btif_core.cc
@@ -29,7 +29,7 @@
#define LOG_TAG "bt_btif_core"
#include <base/at_exit.h>
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/threading/platform_thread.h>
#include <signal.h>
diff --git a/system/btif/src/btif_csis_client.cc b/system/btif/src/btif_csis_client.cc
index d12153bc8d..07878d3065 100644
--- a/system/btif/src/btif_csis_client.cc
+++ b/system/btif/src/btif_csis_client.cc
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
#include <hardware/bluetooth.h>
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index 9c83f17d87..0dfc30bd2a 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -30,7 +30,7 @@
#include "btif_dm.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <bluetooth/uuid.h>
#include <hardware/bluetooth.h>
diff --git a/system/btif/src/btif_gatt_client.cc b/system/btif/src/btif_gatt_client.cc
index dd7ac2f8da..a6150b5306 100644
--- a/system/btif/src/btif_gatt_client.cc
+++ b/system/btif/src/btif_gatt_client.cc
@@ -27,7 +27,7 @@
#define LOG_TAG "bt_btif_gattc"
#include <base/at_exit.h>
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/threading/thread.h>
#include <errno.h>
diff --git a/system/btif/src/btif_gatt_server.cc b/system/btif/src/btif_gatt_server.cc
index cac7bf9ec8..b97f2df18f 100644
--- a/system/btif/src/btif_gatt_server.cc
+++ b/system/btif/src/btif_gatt_server.cc
@@ -26,7 +26,7 @@
#define LOG_TAG "bt_btif_gatt"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <errno.h>
#include <hardware/bluetooth.h>
#include <hardware/bt_gatt.h>
diff --git a/system/btif/src/btif_has_client.cc b/system/btif/src/btif_has_client.cc
index cf9f4f7a49..c62eb0926c 100644
--- a/system/btif/src/btif_has_client.cc
+++ b/system/btif/src/btif_has_client.cc
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#include <base/bind.h>
#include <base/bind_helpers.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
#include <hardware/bluetooth.h>
diff --git a/system/btif/src/btif_hearing_aid.cc b/system/btif/src/btif_hearing_aid.cc
index f2198e9bb3..1fdd46029e 100644
--- a/system/btif/src/btif_hearing_aid.cc
+++ b/system/btif/src/btif_hearing_aid.cc
@@ -18,7 +18,7 @@
/* Hearing Aid Profile Interface */
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
#include <hardware/bluetooth.h>
diff --git a/system/btif/src/btif_hf.cc b/system/btif/src/btif_hf.cc
index 868cee7dee..18a1ef67b4 100644
--- a/system/btif/src/btif_hf.cc
+++ b/system/btif/src/btif_hf.cc
@@ -27,7 +27,7 @@
#define LOG_TAG "bt_btif_hf"
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
diff --git a/system/btif/src/btif_keystore.cc b/system/btif/src/btif_keystore.cc
index 592d306b87..a0796e7f9c 100644
--- a/system/btif/src/btif_keystore.cc
+++ b/system/btif/src/btif_keystore.cc
@@ -18,7 +18,7 @@
#include "btif_keystore.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
#include <hardware/bluetooth.h>
diff --git a/system/btif/src/btif_le_audio_broadcaster.cc b/system/btif/src/btif_le_audio_broadcaster.cc
index 7b867a19d6..85c7abb854 100644
--- a/system/btif/src/btif_le_audio_broadcaster.cc
+++ b/system/btif/src/btif_le_audio_broadcaster.cc
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <hardware/bluetooth.h>
#include <hardware/bt_le_audio.h>
diff --git a/system/btif/src/btif_pan.cc b/system/btif/src/btif_pan.cc
index a567cfcb7c..7cf608799f 100644
--- a/system/btif/src/btif_pan.cc
+++ b/system/btif/src/btif_pan.cc
@@ -28,7 +28,7 @@
#define LOG_TAG "bt_btif_pan"
#include <arpa/inet.h>
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <fcntl.h>
#include <linux/if_ether.h>
diff --git a/system/btif/src/btif_profile_queue.cc b/system/btif/src/btif_profile_queue.cc
index d4f23ad28a..16f74a3d0b 100644
--- a/system/btif/src/btif_profile_queue.cc
+++ b/system/btif/src/btif_profile_queue.cc
@@ -28,8 +28,8 @@
#include "btif_profile_queue.h"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include <base/strings/stringprintf.h>
#include <string.h>
diff --git a/system/btif/src/btif_sock.cc b/system/btif/src/btif_sock.cc
index fba5f54110..fbe7dbe1b3 100644
--- a/system/btif/src/btif_sock.cc
+++ b/system/btif/src/btif_sock.cc
@@ -18,7 +18,7 @@
#define LOG_TAG "bt_btif_sock"
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
#include <hardware/bluetooth.h>
diff --git a/system/btif/src/btif_vc.cc b/system/btif/src/btif_vc.cc
index 00b6b8e7ab..a5915d157c 100644
--- a/system/btif/src/btif_vc.cc
+++ b/system/btif/src/btif_vc.cc
@@ -17,7 +17,7 @@
/* Volume Control Interface */
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
#include <hardware/bluetooth.h>
diff --git a/system/btif/test/btif_profile_queue_test.cc b/system/btif/test/btif_profile_queue_test.cc
index da2412dde4..a525fb4715 100644
--- a/system/btif/test/btif_profile_queue_test.cc
+++ b/system/btif/test/btif_profile_queue_test.cc
@@ -17,8 +17,8 @@
******************************************************************************/
#include "btif/include/btif_profile_queue.h"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/location.h>
#include <gtest/gtest.h>
diff --git a/system/common/base_bind_unittest.cc b/system/common/base_bind_unittest.cc
index dc4d0682ed..a5dc1574c0 100644
--- a/system/common/base_bind_unittest.cc
+++ b/system/common/base_bind_unittest.cc
@@ -13,8 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/threading/platform_thread.h>
#include <gtest/gtest.h>
#include <sys/capability.h>
diff --git a/system/common/benchmark/thread_performance_benchmark.cc b/system/common/benchmark/thread_performance_benchmark.cc
index 8538dac05f..0f718801e9 100644
--- a/system/common/benchmark/thread_performance_benchmark.cc
+++ b/system/common/benchmark/thread_performance_benchmark.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/run_loop.h>
#include <base/threading/thread.h>
diff --git a/system/common/benchmark/timer_performance_benchmark.cc b/system/common/benchmark/timer_performance_benchmark.cc
index 4dc04f2a3d..1447ac41c1 100644
--- a/system/common/benchmark/timer_performance_benchmark.cc
+++ b/system/common/benchmark/timer_performance_benchmark.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/run_loop.h>
#include <base/threading/thread.h>
#include <benchmark/benchmark.h>
diff --git a/system/common/message_loop_thread.h b/system/common/message_loop_thread.h
index ece1d0ffbc..06d7958d0f 100644
--- a/system/common/message_loop_thread.h
+++ b/system/common/message_loop_thread.h
@@ -22,7 +22,7 @@
#include <string>
#include <thread>
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/run_loop.h>
#include <base/threading/platform_thread.h>
diff --git a/system/common/message_loop_thread_unittest.cc b/system/common/message_loop_thread_unittest.cc
index 0e8f0a462e..c61c9046a7 100644
--- a/system/common/message_loop_thread_unittest.cc
+++ b/system/common/message_loop_thread_unittest.cc
@@ -21,7 +21,7 @@
#include <gtest/gtest.h>
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/threading/platform_thread.h>
#include <sys/capability.h>
#include <syscall.h>
diff --git a/system/common/once_timer.h b/system/common/once_timer.h
index d708ed97d6..6722d6b1e0 100644
--- a/system/common/once_timer.h
+++ b/system/common/once_timer.h
@@ -16,8 +16,8 @@
#pragma once
-#include <base/bind.h>
#include <base/cancelable_callback.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/time/time.h>
diff --git a/system/common/once_timer_unittest.cc b/system/common/once_timer_unittest.cc
index 57996559f5..ac326c9eb7 100644
--- a/system/common/once_timer_unittest.cc
+++ b/system/common/once_timer_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <gtest/gtest.h>
#include <future>
diff --git a/system/common/repeating_timer.cc b/system/common/repeating_timer.cc
index 9a2e415e85..11762264e0 100644
--- a/system/common/repeating_timer.cc
+++ b/system/common/repeating_timer.cc
@@ -19,7 +19,7 @@
#include "message_loop_thread.h"
#include "time_util.h"
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
namespace bluetooth {
diff --git a/system/common/repeating_timer.h b/system/common/repeating_timer.h
index 5c2c9e3169..9319fa9880 100644
--- a/system/common/repeating_timer.h
+++ b/system/common/repeating_timer.h
@@ -16,8 +16,8 @@
#pragma once
-#include <base/bind.h>
#include <base/cancelable_callback.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/time/time.h>
diff --git a/system/common/repeating_timer_unittest.cc b/system/common/repeating_timer_unittest.cc
index b98b12cf1a..65bee83b76 100644
--- a/system/common/repeating_timer_unittest.cc
+++ b/system/common/repeating_timer_unittest.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <gtest/gtest.h>
#include <future>
diff --git a/system/common/test/thread_performance_test.cc b/system/common/test/thread_performance_test.cc
index b9ab10605b..1e764f8dac 100644
--- a/system/common/test/thread_performance_test.cc
+++ b/system/common/test/thread_performance_test.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/run_loop.h>
#include <base/threading/thread.h>
diff --git a/system/device/include/controller.h b/system/device/include/controller.h
index 6daddd200d..58a80cdabf 100644
--- a/system/device/include/controller.h
+++ b/system/device/include/controller.h
@@ -21,7 +21,7 @@
#include <cstddef>
#include <cstdint>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "btcore/include/version.h"
#include "types/raw_address.h"
diff --git a/system/gd/common/bind.h b/system/gd/common/bind.h
index e46d3d2c98..5692e02b03 100644
--- a/system/gd/common/bind.h
+++ b/system/gd/common/bind.h
@@ -16,7 +16,7 @@
#pragma once
-#include "base/bind.h"
+#include "base/functional/bind.h"
namespace bluetooth {
namespace common {
diff --git a/system/gd/common/callback.h b/system/gd/common/callback.h
index b8be642e24..7bf6f3a4ef 100644
--- a/system/gd/common/callback.h
+++ b/system/gd/common/callback.h
@@ -16,7 +16,7 @@
#pragma once
-#include "base/callback.h"
+#include "base/functional/callback.h"
namespace bluetooth {
namespace common {
diff --git a/system/gd/rust/shim/callbacks/callbacks.h b/system/gd/rust/shim/callbacks/callbacks.h
index 98d9f81b6b..48b3d49602 100644
--- a/system/gd/rust/shim/callbacks/callbacks.h
+++ b/system/gd/rust/shim/callbacks/callbacks.h
@@ -1,6 +1,6 @@
#pragma once
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "rust/cxx.h"
diff --git a/system/gd/rust/topshim/btav/btav_shim.cc b/system/gd/rust/topshim/btav/btav_shim.cc
index d010ee8052..424b0953e1 100644
--- a/system/gd/rust/topshim/btav/btav_shim.cc
+++ b/system/gd/rust/topshim/btav/btav_shim.cc
@@ -19,7 +19,7 @@
#include <cstdio>
#include <memory>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "include/hardware/avrcp/avrcp.h"
#include "include/hardware/bluetooth.h"
#include "rust/cxx.h"
diff --git a/system/gd/rust/topshim/gatt/gatt_ble_advertiser_shim.cc b/system/gd/rust/topshim/gatt/gatt_ble_advertiser_shim.cc
index 49ae8e5341..a47cfab4e8 100644
--- a/system/gd/rust/topshim/gatt/gatt_ble_advertiser_shim.cc
+++ b/system/gd/rust/topshim/gatt/gatt_ble_advertiser_shim.cc
@@ -16,8 +16,8 @@
#include "gd/rust/topshim/gatt/gatt_ble_advertiser_shim.h"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <algorithm>
#include <iterator>
diff --git a/system/gd/rust/topshim/gatt/gatt_ble_scanner_shim.cc b/system/gd/rust/topshim/gatt/gatt_ble_scanner_shim.cc
index 806cfe267c..be7dec180f 100644
--- a/system/gd/rust/topshim/gatt/gatt_ble_scanner_shim.cc
+++ b/system/gd/rust/topshim/gatt/gatt_ble_scanner_shim.cc
@@ -16,8 +16,8 @@
#include "gd/rust/topshim/gatt/gatt_ble_scanner_shim.h"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <algorithm>
#include <iterator>
diff --git a/system/gd/rust/topshim/gatt/gatt_shim.cc b/system/gd/rust/topshim/gatt/gatt_shim.cc
index a737100973..1439e8241d 100644
--- a/system/gd/rust/topshim/gatt/gatt_shim.cc
+++ b/system/gd/rust/topshim/gatt/gatt_shim.cc
@@ -16,8 +16,8 @@
#include "gd/rust/topshim/gatt/gatt_shim.h"
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "rust/cxx.h"
#include "src/profiles/gatt.rs.h"
#include "types/raw_address.h"
diff --git a/system/hci/include/hci_layer.h b/system/hci/include/hci_layer.h
index 74ffc5ce76..ab781ff010 100644
--- a/system/hci/include/hci_layer.h
+++ b/system/hci/include/hci_layer.h
@@ -18,7 +18,7 @@
#pragma once
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <base/location.h>
#include "osi/include/future.h"
diff --git a/system/include/bind_helpers.h b/system/include/bind_helpers.h
index c92d8f768e..b7bff4955a 100644
--- a/system/include/bind_helpers.h
+++ b/system/include/bind_helpers.h
@@ -16,7 +16,7 @@
#pragma once
#if defined(BASE_VER) && BASE_VER >= 860220
-#include <base/callback_helpers.h>
+#include <base/functional/callback_helpers.h>
#else
#include <base/bind_helpers.h>
#endif
diff --git a/system/include/hardware/avrcp/avrcp.h b/system/include/hardware/avrcp/avrcp.h
index a78027d0c0..87c42e771c 100644
--- a/system/include/hardware/avrcp/avrcp.h
+++ b/system/include/hardware/avrcp/avrcp.h
@@ -20,7 +20,7 @@
#include <string>
#include <vector>
-#include <base/callback_forward.h>
+#include <base/functional/callback_forward.h>
#include "avrcp_common.h"
#include "raw_address.h"
diff --git a/system/include/hardware/ble_advertiser.h b/system/include/hardware/ble_advertiser.h
index 3e53851105..f18937e526 100644
--- a/system/include/hardware/ble_advertiser.h
+++ b/system/include/hardware/ble_advertiser.h
@@ -17,7 +17,7 @@
#ifndef ANDROID_INCLUDE_BLE_ADVERTISER_H
#define ANDROID_INCLUDE_BLE_ADVERTISER_H
-#include <base/callback_forward.h>
+#include <base/functional/callback_forward.h>
#include <raw_address.h>
#include <stdint.h>
diff --git a/system/include/hardware/bluetooth.h b/system/include/hardware/bluetooth.h
index 6ab1c34bc8..0c2c0513f8 100644
--- a/system/include/hardware/bluetooth.h
+++ b/system/include/hardware/bluetooth.h
@@ -24,7 +24,7 @@
#include <sys/types.h>
#include "avrcp/avrcp.h"
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "bluetooth/uuid.h"
#include "bt_transport.h"
#include "raw_address.h"
diff --git a/system/main/shim/btm_api.cc b/system/main/shim/btm_api.cc
index 742e64703f..535e42aa5d 100644
--- a/system/main/shim/btm_api.cc
+++ b/system/main/shim/btm_api.cc
@@ -18,7 +18,7 @@
#include "main/shim/btm_api.h"
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include <mutex>
diff --git a/system/main/shim/btm_api.h b/system/main/shim/btm_api.h
index 0a2edb8ae9..6d4869043f 100644
--- a/system/main/shim/btm_api.h
+++ b/system/main/shim/btm_api.h
@@ -16,7 +16,7 @@
#pragma once
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "device/include/esco_parameters.h"
#include "stack/btm/btm_sec.h"
#include "stack/btm/neighbor_inquiry.h"
diff --git a/system/main/shim/hci_layer.cc b/system/main/shim/hci_layer.cc
index 8581f85b7c..361544c3bc 100644
--- a/system/main/shim/hci_layer.cc
+++ b/system/main/shim/hci_layer.cc
@@ -18,7 +18,7 @@
#include "hci/hci_layer.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <algorithm>
#include <cstdint>
diff --git a/system/main/shim/le_scanning_manager.cc b/system/main/shim/le_scanning_manager.cc
index 800c88b5bb..f2e8ff2222 100644
--- a/system/main/shim/le_scanning_manager.cc
+++ b/system/main/shim/le_scanning_manager.cc
@@ -18,7 +18,7 @@
#include "le_scanning_manager.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/threading/thread.h>
#include <hardware/bluetooth.h>
diff --git a/system/profile/avrcp/connection_handler.cc b/system/profile/avrcp/connection_handler.cc
index fd87b675ed..abd32cf151 100644
--- a/system/profile/avrcp/connection_handler.cc
+++ b/system/profile/avrcp/connection_handler.cc
@@ -16,7 +16,7 @@
#include "connection_handler.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <map>
diff --git a/system/profile/avrcp/connection_handler.h b/system/profile/avrcp/connection_handler.h
index 67445a8df5..58c3bbe511 100644
--- a/system/profile/avrcp/connection_handler.h
+++ b/system/profile/avrcp/connection_handler.h
@@ -16,7 +16,7 @@
#pragma once
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/memory/weak_ptr.h>
#include <map>
#include <memory>
diff --git a/system/profile/avrcp/device.h b/system/profile/avrcp/device.h
index 07e1cac7d2..1564d62da4 100644
--- a/system/profile/avrcp/device.h
+++ b/system/profile/avrcp/device.h
@@ -20,8 +20,8 @@
#include <memory>
#include <stack>
-#include <base/bind.h>
#include <base/cancelable_callback.h>
+#include <base/functional/bind.h>
#include "avrcp_internal.h"
#include "hardware/avrcp/avrcp.h"
diff --git a/system/profile/avrcp/tests/avrcp_connection_handler_test.cc b/system/profile/avrcp/tests/avrcp_connection_handler_test.cc
index e9f79c48e4..56834cac82 100644
--- a/system/profile/avrcp/tests/avrcp_connection_handler_test.cc
+++ b/system/profile/avrcp/tests/avrcp_connection_handler_test.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/system/profile/avrcp/tests/avrcp_device_test.cc b/system/profile/avrcp/tests/avrcp_device_test.cc
index e8058aa378..b1fcec2032 100644
--- a/system/profile/avrcp/tests/avrcp_device_test.cc
+++ b/system/profile/avrcp/tests/avrcp_device_test.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/threading/thread.h>
#include <gmock/gmock.h>
diff --git a/system/service/example/heart_rate/heart_rate_server.cc b/system/service/example/heart_rate/heart_rate_server.cc
index 9777c203f8..2a53ba4d63 100644
--- a/system/service/example/heart_rate/heart_rate_server.cc
+++ b/system/service/example/heart_rate/heart_rate_server.cc
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
#include <base/rand_util.h>
diff --git a/system/service/example/heart_rate/server_main.cc b/system/service/example/heart_rate/server_main.cc
index f8953f16a4..f7a434e666 100644
--- a/system/service/example/heart_rate/server_main.cc
+++ b/system/service/example/heart_rate/server_main.cc
@@ -15,8 +15,8 @@
//
#include <base/at_exit.h>
-#include <base/bind.h>
#include <base/command_line.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
#include <base/run_loop.h>
diff --git a/system/service/gatt_server_old.cc b/system/service/gatt_server_old.cc
index 8bb81e4297..ac438d2ef7 100644
--- a/system/service/gatt_server_old.cc
+++ b/system/service/gatt_server_old.cc
@@ -18,8 +18,8 @@
#include "gatt_server_old.h"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <hardware/bluetooth.h>
#include <hardware/bt_gatt.h>
#include <stdio.h>
diff --git a/system/service/ipc/binder/ipc_handler_binder.cc b/system/service/ipc/binder/ipc_handler_binder.cc
index 11ff66fc6b..c8249066bc 100644
--- a/system/service/ipc/binder/ipc_handler_binder.cc
+++ b/system/service/ipc/binder/ipc_handler_binder.cc
@@ -16,7 +16,7 @@
#include "service/ipc/binder/ipc_handler_binder.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <binder/IPCThreadState.h>
#include <binder/IServiceManager.h>
diff --git a/system/service/ipc/dbus/ipc_handler_dbus.cc b/system/service/ipc/dbus/ipc_handler_dbus.cc
index 8abd2449d9..52af25af30 100644
--- a/system/service/ipc/dbus/ipc_handler_dbus.cc
+++ b/system/service/ipc/dbus/ipc_handler_dbus.cc
@@ -16,7 +16,7 @@
#include "service/ipc/dbus/ipc_handler_dbus.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/threading/thread_task_runner_handle.h>
#include <dbus/bus.h>
#include "service/daemon.h"
diff --git a/system/service/ipc/ipc_handler_linux.cc b/system/service/ipc/ipc_handler_linux.cc
index fa7727a87c..43940bebb7 100644
--- a/system/service/ipc/ipc_handler_linux.cc
+++ b/system/service/ipc/ipc_handler_linux.cc
@@ -19,7 +19,7 @@
#include <sys/socket.h>
#include <sys/un.h>
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include "abstract_message_loop.h"
#include "osi/include/socket_utils/sockets.h"
diff --git a/system/service/low_energy_advertiser.cc b/system/service/low_energy_advertiser.cc
index 7a7029f8ca..e34adb9e75 100644
--- a/system/service/low_energy_advertiser.cc
+++ b/system/service/low_energy_advertiser.cc
@@ -20,8 +20,8 @@
#include "service/logging_helpers.h"
#include "stack/include/bt_types.h"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include "bind_helpers.h"
diff --git a/system/service/low_energy_scanner.cc b/system/service/low_energy_scanner.cc
index 8f25e858ce..599fa181da 100644
--- a/system/service/low_energy_scanner.cc
+++ b/system/service/low_energy_scanner.cc
@@ -16,8 +16,8 @@
#include "service/low_energy_scanner.h"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include "service/adapter.h"
diff --git a/system/stack/btm/ble_advertiser_hci_interface.cc b/system/stack/btm/ble_advertiser_hci_interface.cc
index 70d2abfd27..6fa077f6a2 100644
--- a/system/stack/btm/ble_advertiser_hci_interface.cc
+++ b/system/stack/btm/ble_advertiser_hci_interface.cc
@@ -18,8 +18,8 @@
#include "ble_advertiser_hci_interface.h"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/location.h>
#include <base/logging.h>
diff --git a/system/stack/btm/ble_advertiser_hci_interface.h b/system/stack/btm/ble_advertiser_hci_interface.h
index 548a0e2ce4..0b95cf9a6c 100644
--- a/system/stack/btm/ble_advertiser_hci_interface.h
+++ b/system/stack/btm/ble_advertiser_hci_interface.h
@@ -19,7 +19,7 @@
#ifndef BLE_ADVERTISER_HCI_INTERFACE_H
#define BLE_ADVERTISER_HCI_INTERFACE_H
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <vector>
diff --git a/system/stack/btm/ble_scanner_hci_interface.cc b/system/stack/btm/ble_scanner_hci_interface.cc
index 5d3686bd67..57263ccc26 100644
--- a/system/stack/btm/ble_scanner_hci_interface.cc
+++ b/system/stack/btm/ble_scanner_hci_interface.cc
@@ -17,7 +17,7 @@
#include "ble_scanner_hci_interface.h"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include "acl_api.h"
diff --git a/system/stack/btm/ble_scanner_hci_interface.h b/system/stack/btm/ble_scanner_hci_interface.h
index df0541c362..31080016a4 100644
--- a/system/stack/btm/ble_scanner_hci_interface.h
+++ b/system/stack/btm/ble_scanner_hci_interface.h
@@ -18,7 +18,7 @@
#ifndef BLE_SCANNER_HCI_INTERFACE_H
#define BLE_SCANNER_HCI_INTERFACE_H
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <vector>
diff --git a/system/stack/btm/btm_ble_addr.cc b/system/stack/btm/btm_ble_addr.cc
index e83b7964dd..524adbf8ef 100644
--- a/system/stack/btm/btm_ble_addr.cc
+++ b/system/stack/btm/btm_ble_addr.cc
@@ -22,7 +22,7 @@
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <string.h>
#include "btm_ble_int.h"
diff --git a/system/stack/btm/btm_ble_adv_filter.cc b/system/stack/btm/btm_ble_adv_filter.cc
index ec4388a314..2f6fc143b8 100644
--- a/system/stack/btm/btm_ble_adv_filter.cc
+++ b/system/stack/btm/btm_ble_adv_filter.cc
@@ -18,7 +18,7 @@
#define LOG_TAG "bt_btm_ble"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <string.h>
diff --git a/system/stack/btm/btm_ble_batchscan.cc b/system/stack/btm/btm_ble_batchscan.cc
index 22788809c5..6193461cd9 100644
--- a/system/stack/btm/btm_ble_batchscan.cc
+++ b/system/stack/btm/btm_ble_batchscan.cc
@@ -15,7 +15,7 @@
* limitations under the License.
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <stddef.h>
#include <stdio.h>
#include <string.h>
diff --git a/system/stack/btm/btm_ble_bgconn.cc b/system/stack/btm/btm_ble_bgconn.cc
index 480a6fd1bb..faeebf2520 100644
--- a/system/stack/btm/btm_ble_bgconn.cc
+++ b/system/stack/btm/btm_ble_bgconn.cc
@@ -22,7 +22,7 @@
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <cstdint>
diff --git a/system/stack/btm/btm_ble_gap.cc b/system/stack/btm/btm_ble_gap.cc
index 4ba93d8abe..cbf63d6467 100644
--- a/system/stack/btm/btm_ble_gap.cc
+++ b/system/stack/btm/btm_ble_gap.cc
@@ -24,7 +24,7 @@
#define LOG_TAG "bt_btm_ble"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/strings/string_number_conversions.h>
diff --git a/system/stack/btm/btm_ble_multi_adv.cc b/system/stack/btm/btm_ble_multi_adv.cc
index 040d828b30..2d365258cd 100644
--- a/system/stack/btm/btm_ble_multi_adv.cc
+++ b/system/stack/btm/btm_ble_multi_adv.cc
@@ -17,7 +17,7 @@
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
#include <base/memory/weak_ptr.h>
diff --git a/system/stack/btm/btm_iso_impl.h b/system/stack/btm/btm_iso_impl.h
index a9562043ae..fb671deeaa 100644
--- a/system/stack/btm/btm_iso_impl.h
+++ b/system/stack/btm/btm_iso_impl.h
@@ -21,8 +21,8 @@
#include <memory>
#include <set>
-#include "base/bind.h"
-#include "base/callback.h"
+#include "base/functional/bind.h"
+#include "base/functional/callback.h"
#include "base/logging.h"
#include "bind_helpers.h"
#include "btm_dev.h"
diff --git a/system/stack/btu/btu_hcif.cc b/system/stack/btu/btu_hcif.cc
index 4519b1b047..ac1eef6743 100644
--- a/system/stack/btu/btu_hcif.cc
+++ b/system/stack/btu/btu_hcif.cc
@@ -27,7 +27,7 @@
#define LOG_TAG "bt_btu_hcif"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
diff --git a/system/stack/btu/btu_task.cc b/system/stack/btu/btu_task.cc
index 5f3260763f..63ebf89c5c 100644
--- a/system/stack/btu/btu_task.cc
+++ b/system/stack/btu/btu_task.cc
@@ -18,7 +18,7 @@
#define LOG_TAG "bt_btu_task"
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/run_loop.h>
#include <base/threading/thread.h>
diff --git a/system/stack/gatt/connection_manager.cc b/system/stack/gatt/connection_manager.cc
index f1b7f202c7..fc14f7ecae 100644
--- a/system/stack/gatt/connection_manager.cc
+++ b/system/stack/gatt/connection_manager.cc
@@ -18,8 +18,8 @@
#include "connection_manager.h"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/location.h>
#include <base/logging.h>
diff --git a/system/stack/gatt/gatt_attr.cc b/system/stack/gatt/gatt_attr.cc
index f30e0b755e..d845597ce5 100644
--- a/system/stack/gatt/gatt_attr.cc
+++ b/system/stack/gatt/gatt_attr.cc
@@ -25,7 +25,7 @@
#include <map>
-#include "base/callback.h"
+#include "base/functional/callback.h"
#include "bt_target.h"
#include "bt_utils.h"
#include "btif/include/btif_storage.h"
diff --git a/system/stack/gatt/gatt_int.h b/system/stack/gatt/gatt_int.h
index 77a97e1576..dd6ba186b4 100644
--- a/system/stack/gatt/gatt_int.h
+++ b/system/stack/gatt/gatt_int.h
@@ -19,7 +19,7 @@
#ifndef GATT_INT_H
#define GATT_INT_H
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/strings/stringprintf.h>
#include <string.h>
diff --git a/system/stack/hcic/hciblecmds.cc b/system/stack/hcic/hciblecmds.cc
index 4d57696de6..fd99d6ac37 100644
--- a/system/stack/hcic/hciblecmds.cc
+++ b/system/stack/hcic/hciblecmds.cc
@@ -23,7 +23,7 @@
*
******************************************************************************/
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <stddef.h>
#include <string.h>
diff --git a/system/stack/hcic/hcicmds.cc b/system/stack/hcic/hcicmds.cc
index d41f11c2f8..a597fa35f9 100644
--- a/system/stack/hcic/hcicmds.cc
+++ b/system/stack/hcic/hcicmds.cc
@@ -23,7 +23,7 @@
*
******************************************************************************/
-#include <base/callback_forward.h>
+#include <base/functional/callback_forward.h>
#include <stddef.h>
#include <string.h>
diff --git a/system/stack/hid/hidd_conn.cc b/system/stack/hid/hidd_conn.cc
index e80bc933f8..faca3241fc 100644
--- a/system/stack/hid/hidd_conn.cc
+++ b/system/stack/hid/hidd_conn.cc
@@ -23,7 +23,7 @@
*
******************************************************************************/
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
diff --git a/system/stack/hid/hidh_conn.cc b/system/stack/hid/hidh_conn.cc
index 102573253f..108f5a7097 100644
--- a/system/stack/hid/hidh_conn.cc
+++ b/system/stack/hid/hidh_conn.cc
@@ -22,7 +22,7 @@
*
******************************************************************************/
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include <base/strings/stringprintf.h>
#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
diff --git a/system/stack/include/avrc_api.h b/system/stack/include/avrc_api.h
index 4e9201bb5f..0f3d385cfd 100644
--- a/system/stack/include/avrc_api.h
+++ b/system/stack/include/avrc_api.h
@@ -24,7 +24,7 @@
#ifndef AVRC_API_H
#define AVRC_API_H
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <cstdint>
diff --git a/system/stack/include/ble_advertiser.h b/system/stack/include/ble_advertiser.h
index a42b216fd0..e8ac5ea165 100644
--- a/system/stack/include/ble_advertiser.h
+++ b/system/stack/include/ble_advertiser.h
@@ -19,7 +19,7 @@
#ifndef BLE_ADVERTISER_H
#define BLE_ADVERTISER_H
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/memory/weak_ptr.h>
#include <cstdint>
diff --git a/system/stack/include/ble_scanner.h b/system/stack/include/ble_scanner.h
index 1456f90086..bd2011a63b 100644
--- a/system/stack/include/ble_scanner.h
+++ b/system/stack/include/ble_scanner.h
@@ -17,7 +17,7 @@
#ifndef BLE_SCANNER_H
#define BLE_SCANNER_H
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/memory/weak_ptr.h>
#include <vector>
diff --git a/system/stack/include/btm_ble_api.h b/system/stack/include/btm_ble_api.h
index a495bfd962..5f5648103d 100644
--- a/system/stack/include/btm_ble_api.h
+++ b/system/stack/include/btm_ble_api.h
@@ -25,7 +25,7 @@
#ifndef BTM_BLE_API_H
#define BTM_BLE_API_H
-#include <base/callback_forward.h>
+#include <base/functional/callback_forward.h>
#include <hardware/bt_common_types.h>
#include <cstdint>
diff --git a/system/stack/include/btm_ble_api_types.h b/system/stack/include/btm_ble_api_types.h
index 6495082d3e..f66f3c07b6 100644
--- a/system/stack/include/btm_ble_api_types.h
+++ b/system/stack/include/btm_ble_api_types.h
@@ -19,7 +19,7 @@
#ifndef BTM_BLE_API_TYPES_H
#define BTM_BLE_API_TYPES_H
-#include <base/callback_forward.h>
+#include <base/functional/callback_forward.h>
#include <hardware/bt_common_types.h>
#include <cstdint>
diff --git a/system/stack/include/btu.h b/system/stack/include/btu.h
index 30a8e14f23..bc25ca3ada 100644
--- a/system/stack/include/btu.h
+++ b/system/stack/include/btu.h
@@ -27,7 +27,7 @@
#ifndef BTU_H
#define BTU_H
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <base/location.h>
#include <base/threading/thread.h>
diff --git a/system/stack/include/hcimsgs.h b/system/stack/include/hcimsgs.h
index 0f89327623..39a1797700 100644
--- a/system/stack/include/hcimsgs.h
+++ b/system/stack/include/hcimsgs.h
@@ -19,7 +19,7 @@
#ifndef HCIMSGS_H
#define HCIMSGS_H
-#include <base/callback_forward.h>
+#include <base/functional/callback_forward.h>
#include <cstdint>
diff --git a/system/stack/l2cap/l2c_csm.cc b/system/stack/l2cap/l2c_csm.cc
index 2632845db6..9de899a3c4 100755
--- a/system/stack/l2cap/l2c_csm.cc
+++ b/system/stack/l2cap/l2c_csm.cc
@@ -23,7 +23,7 @@
******************************************************************************/
#define LOG_TAG "l2c_csm"
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
diff --git a/system/stack/rfcomm/port_rfc.cc b/system/stack/rfcomm/port_rfc.cc
index 7d6f900e96..927bb1c56d 100644
--- a/system/stack/rfcomm/port_rfc.cc
+++ b/system/stack/rfcomm/port_rfc.cc
@@ -23,7 +23,7 @@
*
******************************************************************************/
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include <frameworks/proto_logging/stats/enums/bluetooth/enums.pb.h>
diff --git a/system/stack/smp/smp_keys.cc b/system/stack/smp/smp_keys.cc
index 47454db87e..b0aa9841e0 100644
--- a/system/stack/smp/smp_keys.cc
+++ b/system/stack/smp/smp_keys.cc
@@ -21,8 +21,8 @@
* This file contains security manager protocol utility functions
*
******************************************************************************/
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <algorithm>
#include <cstring>
diff --git a/system/stack/test/common/mock_controller.h b/system/stack/test/common/mock_controller.h
index 74ee5fc94f..359a03b39a 100644
--- a/system/stack/test/common/mock_controller.h
+++ b/system/stack/test/common/mock_controller.h
@@ -16,7 +16,7 @@
*/
#pragma once
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <gmock/gmock.h>
diff --git a/system/stack/test/common/mock_hcic_layer.h b/system/stack/test/common/mock_hcic_layer.h
index 680dad8be6..251184c415 100644
--- a/system/stack/test/common/mock_hcic_layer.h
+++ b/system/stack/test/common/mock_hcic_layer.h
@@ -16,7 +16,7 @@
*/
#pragma once
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <gmock/gmock.h>
#include <array>
diff --git a/system/stack/test/gatt_connection_manager_test.cc b/system/stack/test/gatt_connection_manager_test.cc
index a073551e99..2753c5f87e 100644
--- a/system/stack/test/gatt_connection_manager_test.cc
+++ b/system/stack/test/gatt_connection_manager_test.cc
@@ -1,6 +1,6 @@
-#include <base/bind.h>
#include <base/bind_helpers.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/location.h>
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/system/test/common/jni_thread.cc b/system/test/common/jni_thread.cc
index 978533d625..8216671445 100644
--- a/system/test/common/jni_thread.cc
+++ b/system/test/common/jni_thread.cc
@@ -16,7 +16,7 @@
#include "test/common/jni_thread.h"
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <map>
diff --git a/system/test/common/jni_thread.h b/system/test/common/jni_thread.h
index 12a2457354..580997d832 100644
--- a/system/test/common/jni_thread.h
+++ b/system/test/common/jni_thread.h
@@ -16,7 +16,7 @@
#pragma once
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <queue>
diff --git a/system/test/common/main_handler.cc b/system/test/common/main_handler.cc
index fbcc346542..fb9d52874a 100644
--- a/system/test/common/main_handler.cc
+++ b/system/test/common/main_handler.cc
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#include <base/bind.h>
-#include <base/callback_forward.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback_forward.h>
#include <base/location.h>
#include <base/time/time.h>
#include <sys/types.h>
diff --git a/system/test/common/main_handler.h b/system/test/common/main_handler.h
index 1122c4ad12..3aeeb663d5 100644
--- a/system/test/common/main_handler.h
+++ b/system/test/common/main_handler.h
@@ -16,7 +16,7 @@
#pragma once
-#include <base/callback_forward.h>
+#include <base/functional/callback_forward.h>
#include <base/location.h>
#include <base/time/time.h>
#include <functional>
diff --git a/system/test/mock/mock_bta_ag_api.cc b/system/test/mock/mock_bta_ag_api.cc
index c846c7d012..df0eb6c63f 100644
--- a/system/test/mock/mock_bta_ag_api.cc
+++ b/system/test/mock/mock_bta_ag_api.cc
@@ -24,7 +24,7 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <cstdint>
diff --git a/system/test/mock/mock_bta_csis.cc b/system/test/mock/mock_bta_csis.cc
index bb8603a534..cbf2c488ec 100644
--- a/system/test/mock/mock_bta_csis.cc
+++ b/system/test/mock/mock_bta_csis.cc
@@ -20,7 +20,7 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <hardware/bt_csis.h>
#include "bta/include/bta_csis_api.h"
diff --git a/system/test/mock/mock_bta_dm_api.h b/system/test/mock/mock_bta_dm_api.h
index 3e64ff3679..3af4a2e024 100644
--- a/system/test/mock/mock_bta_dm_api.h
+++ b/system/test/mock/mock_bta_dm_api.h
@@ -34,7 +34,7 @@ extern std::map<std::string, int> mock_function_count_map;
// still applies, but crafting proper inclusion is out of scope
// for this effort. This compilation unit may compile as-is, or
// may need attention to prune from (or add to ) the inclusion set.
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <map>
#include <string>
diff --git a/system/test/mock/mock_bta_gattc_api.cc b/system/test/mock/mock_bta_gattc_api.cc
index 148afd343f..ca9d19801c 100644
--- a/system/test/mock/mock_bta_gattc_api.cc
+++ b/system/test/mock/mock_bta_gattc_api.cc
@@ -19,14 +19,14 @@
* Functions generated:30
*/
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <map>
#include <string>
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <ios>
#include <list>
diff --git a/system/test/mock/mock_bta_gatts_api.cc b/system/test/mock/mock_bta_gatts_api.cc
index ba86ae5355..8a041f0bea 100644
--- a/system/test/mock/mock_bta_gatts_api.cc
+++ b/system/test/mock/mock_bta_gatts_api.cc
@@ -24,8 +24,8 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/location.h>
#include <cstdint>
diff --git a/system/test/mock/mock_bta_has.cc b/system/test/mock/mock_bta_has.cc
index 2b92b58353..8cd1c103c9 100644
--- a/system/test/mock/mock_bta_has.cc
+++ b/system/test/mock/mock_bta_has.cc
@@ -19,8 +19,8 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
#include <base/bind_helpers.h>
+#include <base/functional/bind.h>
#include "bta/include/bta_has_api.h"
#include "types/raw_address.h"
diff --git a/system/test/mock/mock_bta_hearing_aid.cc b/system/test/mock/mock_bta_hearing_aid.cc
index 200df2d948..428203299e 100644
--- a/system/test/mock/mock_bta_hearing_aid.cc
+++ b/system/test/mock/mock_bta_hearing_aid.cc
@@ -24,8 +24,8 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/strings/string_number_conversions.h>
#include <cstdint>
#include <vector>
diff --git a/system/test/mock/mock_bta_jv_api.cc b/system/test/mock/mock_bta_jv_api.cc
index 26a1960958..6d97fca36f 100644
--- a/system/test/mock/mock_bta_jv_api.cc
+++ b/system/test/mock/mock_bta_jv_api.cc
@@ -24,7 +24,7 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
diff --git a/system/test/mock/mock_bta_leaudio.cc b/system/test/mock/mock_bta_leaudio.cc
index a4bf05c42f..3879dff419 100644
--- a/system/test/mock/mock_bta_leaudio.cc
+++ b/system/test/mock/mock_bta_leaudio.cc
@@ -25,8 +25,8 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
#include <base/bind_helpers.h>
+#include <base/functional/bind.h>
#include <hardware/bt_le_audio.h>
#include "bta/include/bta_le_audio_api.h"
diff --git a/system/test/mock/mock_bta_leaudio_broadcaster.cc b/system/test/mock/mock_bta_leaudio_broadcaster.cc
index f0ce96fab8..f50a7ad08f 100644
--- a/system/test/mock/mock_bta_leaudio_broadcaster.cc
+++ b/system/test/mock/mock_bta_leaudio_broadcaster.cc
@@ -19,8 +19,8 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
#include <base/bind_helpers.h>
+#include <base/functional/bind.h>
#include <hardware/bt_le_audio.h>
#include "bta/include/bta_le_audio_broadcaster_api.h"
diff --git a/system/test/mock/mock_bta_sdp_api.cc b/system/test/mock/mock_bta_sdp_api.cc
index 4df716ee57..10dde0a4f1 100644
--- a/system/test/mock/mock_bta_sdp_api.cc
+++ b/system/test/mock/mock_bta_sdp_api.cc
@@ -24,7 +24,7 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include "bt_target.h"
diff --git a/system/test/mock/mock_bta_sys_main.h b/system/test/mock/mock_bta_sys_main.h
index e3a9851aa9..b92a7ebd07 100644
--- a/system/test/mock/mock_bta_sys_main.h
+++ b/system/test/mock/mock_bta_sys_main.h
@@ -34,7 +34,7 @@ extern std::map<std::string, int> mock_function_count_map;
// still applies, but crafting proper inclusion is out of scope
// for this effort. This compilation unit may compile as-is, or
// may need attention to prune from (or add to ) the inclusion set.
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <cstring>
#include <map>
diff --git a/system/test/mock/mock_bta_vc.cc b/system/test/mock/mock_bta_vc.cc
index 309e62faf9..214e759563 100644
--- a/system/test/mock/mock_bta_vc.cc
+++ b/system/test/mock/mock_bta_vc.cc
@@ -24,7 +24,7 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/strings/string_number_conversions.h>
#include <hardware/bt_vc.h>
diff --git a/system/test/mock/mock_btif_avrcp_service.h b/system/test/mock/mock_btif_avrcp_service.h
index 7452a76ca6..f9e4190f3f 100644
--- a/system/test/mock/mock_btif_avrcp_service.h
+++ b/system/test/mock/mock_btif_avrcp_service.h
@@ -35,7 +35,7 @@ extern std::map<std::string, int> mock_function_count_map;
// still applies, but crafting proper inclusion is out of scope
// for this effort. This compilation unit may compile as-is, or
// may need attention to prune from (or add to ) the inclusion set.
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/task/cancelable_task_tracker.h>
#include <base/threading/thread.h>
diff --git a/system/test/mock/mock_btif_core.cc b/system/test/mock/mock_btif_core.cc
index e0ed5a142d..264c984936 100644
--- a/system/test/mock/mock_btif_core.cc
+++ b/system/test/mock/mock_btif_core.cc
@@ -25,7 +25,7 @@
extern std::map<std::string, int> mock_function_count_map;
#include <base/at_exit.h>
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/threading/platform_thread.h>
#include <signal.h>
#include <sys/types.h>
diff --git a/system/test/mock/mock_btif_profile_queue.h b/system/test/mock/mock_btif_profile_queue.h
index a5b1b3fa36..620a18073d 100644
--- a/system/test/mock/mock_btif_profile_queue.h
+++ b/system/test/mock/mock_btif_profile_queue.h
@@ -35,8 +35,8 @@
// still applies, but crafting proper inclusion is out of scope
// for this effort. This compilation unit may compile as-is, or
// may need attention to prune from (or add to ) the inclusion set.
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/logging.h>
#include <base/strings/stringprintf.h>
#include <string.h>
diff --git a/system/test/mock/mock_btu_task.cc b/system/test/mock/mock_btu_task.cc
index b0e5edfa70..2b7b9e2ebb 100644
--- a/system/test/mock/mock_btu_task.cc
+++ b/system/test/mock/mock_btu_task.cc
@@ -24,7 +24,7 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/logging.h>
#include <base/run_loop.h>
#include <base/threading/thread.h>
diff --git a/system/test/mock/mock_legacy_hci_iterface.cc b/system/test/mock/mock_legacy_hci_iterface.cc
index aa83e497c6..70afb51a92 100644
--- a/system/test/mock/mock_legacy_hci_iterface.cc
+++ b/system/test/mock/mock_legacy_hci_iterface.cc
@@ -19,7 +19,7 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <stddef.h>
#include "bt_target.h"
diff --git a/system/test/mock/mock_main_shim_btm_api.cc b/system/test/mock/mock_main_shim_btm_api.cc
index 78290b2422..3d2442a846 100644
--- a/system/test/mock/mock_main_shim_btm_api.cc
+++ b/system/test/mock/mock_main_shim_btm_api.cc
@@ -19,13 +19,13 @@
* Functions generated:85
*/
-#include <base/bind.h>
-#include <base/callback.h>
-
#include <cstdint>
#include <map>
#include <string>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
+
#include "main/shim/btm_api.h"
#include "stack/include/bt_hdr.h"
#include "stack/include/bt_octets.h"
diff --git a/system/test/mock/mock_stack_btm_ble_addr.h b/system/test/mock/mock_stack_btm_ble_addr.h
index 6f9a93737a..79db810781 100644
--- a/system/test/mock/mock_stack_btm_ble_addr.h
+++ b/system/test/mock/mock_stack_btm_ble_addr.h
@@ -21,7 +21,7 @@
* mockcify.pl ver 0.2
*/
-#include <base/callback.h> // RepeatingCallback
+#include <base/functional/callback.h> // RepeatingCallback
#include <cstdint>
#include <functional>
#include <map>
diff --git a/system/test/mock/mock_stack_btm_ble_adv_filter.cc b/system/test/mock/mock_stack_btm_ble_adv_filter.cc
index 6e4f6ce754..89cb50d297 100644
--- a/system/test/mock/mock_stack_btm_ble_adv_filter.cc
+++ b/system/test/mock/mock_stack_btm_ble_adv_filter.cc
@@ -24,7 +24,7 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <string.h>
#include <algorithm>
#include <vector>
diff --git a/system/test/mock/mock_stack_btm_ble_batchscan.cc b/system/test/mock/mock_stack_btm_ble_batchscan.cc
index 4e88e1db3b..e4ae7c7bf3 100644
--- a/system/test/mock/mock_stack_btm_ble_batchscan.cc
+++ b/system/test/mock/mock_stack_btm_ble_batchscan.cc
@@ -24,8 +24,8 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <string.h>
#include <cstddef>
diff --git a/system/test/mock/mock_stack_btm_ble_bgconn.h b/system/test/mock/mock_stack_btm_ble_bgconn.h
index f88cfb1d33..53fe256aed 100644
--- a/system/test/mock/mock_stack_btm_ble_bgconn.h
+++ b/system/test/mock/mock_stack_btm_ble_bgconn.h
@@ -34,7 +34,7 @@ extern std::map<std::string, int> mock_function_count_map;
// still applies, but crafting proper inclusion is out of scope
// for this effort. This compilation unit may compile as-is, or
// may need attention to prune the inclusion set.
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <cstdint>
#include <unordered_map>
#include "device/include/controller.h"
diff --git a/system/test/mock/mock_stack_btm_ble_gap.cc b/system/test/mock/mock_stack_btm_ble_gap.cc
index 8e8c4f5658..0d6c4abd92 100644
--- a/system/test/mock/mock_stack_btm_ble_gap.cc
+++ b/system/test/mock/mock_stack_btm_ble_gap.cc
@@ -24,7 +24,7 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/strings/string_number_conversions.h>
#include <cstdint>
diff --git a/system/test/mock/mock_stack_btm_ble_multi_adv.cc b/system/test/mock/mock_stack_btm_ble_multi_adv.cc
index f6f25ed1ca..4e08cccddf 100644
--- a/system/test/mock/mock_stack_btm_ble_multi_adv.cc
+++ b/system/test/mock/mock_stack_btm_ble_multi_adv.cc
@@ -24,7 +24,7 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
#include <base/memory/weak_ptr.h>
diff --git a/system/test/mock/mock_stack_btm_ble_scanner.cc b/system/test/mock/mock_stack_btm_ble_scanner.cc
index 64d9891fcb..5bf5a90c52 100644
--- a/system/test/mock/mock_stack_btm_ble_scanner.cc
+++ b/system/test/mock/mock_stack_btm_ble_scanner.cc
@@ -19,7 +19,7 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <base/location.h>
#include <base/logging.h>
#include <base/memory/weak_ptr.h>
@@ -56,4 +56,4 @@ bool BleScanningManager::IsInitialized() {
void BleScanningManager::Initialize(BleScannerHciInterface* interface) {
mock_function_count_map[__func__]++;
}
-void btm_ble_scanner_cleanup(void) { mock_function_count_map[__func__]++; } \ No newline at end of file
+void btm_ble_scanner_cleanup(void) { mock_function_count_map[__func__]++; }
diff --git a/system/test/mock/mock_stack_btu_hcif.cc b/system/test/mock/mock_stack_btu_hcif.cc
index 6ea1be2da6..a1de571343 100644
--- a/system/test/mock/mock_stack_btu_hcif.cc
+++ b/system/test/mock/mock_stack_btu_hcif.cc
@@ -26,8 +26,8 @@
extern std::map<std::string, int> mock_function_count_map;
#define LOG_TAG "bt_btu_hcif"
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/location.h>
#include "stack/include/bt_hdr.h"
diff --git a/system/test/mock/mock_stack_gatt_attr.cc b/system/test/mock/mock_stack_gatt_attr.cc
index 051ede282f..5c031de2c6 100644
--- a/system/test/mock/mock_stack_gatt_attr.cc
+++ b/system/test/mock/mock_stack_gatt_attr.cc
@@ -19,7 +19,7 @@
* Functions generated:14
*/
-#include <base/callback.h>
+#include <base/functional/callback.h>
#include <cstdint>
#include <map>
diff --git a/system/test/mock/mock_stack_gatt_connection_manager.cc b/system/test/mock/mock_stack_gatt_connection_manager.cc
index 372b4f0813..5e507e7587 100644
--- a/system/test/mock/mock_stack_gatt_connection_manager.cc
+++ b/system/test/mock/mock_stack_gatt_connection_manager.cc
@@ -24,8 +24,8 @@
extern std::map<std::string, int> mock_function_count_map;
-#include <base/bind.h>
-#include <base/callback.h>
+#include <base/functional/bind.h>
+#include <base/functional/callback.h>
#include <base/location.h>
#include <base/logging.h>
diff --git a/system/test/mock/mock_stack_hcic_hciblecmds.h b/system/test/mock/mock_stack_hcic_hciblecmds.h
index ae074c754f..92a1c2cd7b 100644
--- a/system/test/mock/mock_stack_hcic_hciblecmds.h
+++ b/system/test/mock/mock_stack_hcic_hciblecmds.h
@@ -35,7 +35,7 @@ extern std::map<std::string, int> mock_function_count_map;
// still applies, but crafting proper inclusion is out of scope
// for this effort. This compilation unit may compile as-is, or
// may need attention to prune from (or add to ) the inclusion set.
-#include <base/bind.h>
+#include <base/functional/bind.h>
#include <stddef.h>
#include <string.h>
diff --git a/system/test/mock/mock_stack_hcic_hcicmds.h b/system/test/mock/mock_stack_hcic_hcicmds.h
index d7a8eef1ef..1c0c5671d1 100644
--- a/system/test/mock/mock_stack_hcic_hcicmds.h
+++ b/system/test/mock/mock_stack_hcic_hcicmds.h
@@ -36,7 +36,7 @@ extern std::map<std::string, int> mock_function_count_map;
// still applies, but crafting proper inclusion is out of scope
// for this effort. This compilation unit may compile as-is, or
// may need attention to prune from (or add to ) the inclusion set.
-#include <base/callback_forward.h>
+#include <base/functional/callback_forward.h>
#include <stddef.h>
#include <string.h>