system/stack/gatt: Fix -Wmissing-prototype errors

Bug: 369381361
Test: m com.android.btservices
Flag: EXEMPT, no logical change
Change-Id: I766addf414dc03345d4a254326e396856f229dbb

22 files changed, 82 insertions, 231 deletions

diff --git a/system/btif/src/bluetooth.cc b/system/btif/src/bluetooth.cc
index c4bb371e80..906a8bd732 100644
--- a/system/btif/src/bluetooth.cc
+++ b/system/btif/src/bluetooth.cc
@@ -106,6 +106,7 @@
 #include "stack/include/avdt_api.h"
 #include "stack/include/btm_client_interface.h"
 #include "stack/include/btm_status.h"
+#include "stack/include/gatt_api.h"
 #include "stack/include/hfp_lc3_decoder.h"
 #include "stack/include/hfp_lc3_encoder.h"
 #include "stack/include/hfp_msbc_decoder.h"
@@ -188,7 +189,6 @@ extern VolumeControlInterface* btif_volume_control_get_interface();
 
 bt_status_t btif_av_sink_execute_service(bool b_enable);
 
-extern void gatt_tcb_dump(int fd);
 extern void bta_gatt_client_dump(int fd);
 
 /*******************************************************************************
diff --git a/system/stack/acl/ble_acl.cc b/system/stack/acl/ble_acl.cc
index 0606716f75..fb26beab70 100644
--- a/system/stack/acl/ble_acl.cc
+++ b/system/stack/acl/ble_acl.cc
@@ -29,6 +29,7 @@
 #include "stack/include/acl_api.h"
 #include "stack/include/btm_ble_addr.h"
 #include "stack/include/btm_ble_privacy.h"
+#include "stack/include/gatt_api.h"
 #include "stack/include/l2cap_hci_link_interface.h"
 #include "types/raw_address.h"
 
@@ -144,8 +145,6 @@ void acl_ble_connection_fail(const tBLE_BD_ADDR& address_with_type, uint16_t /*
   btm_ble_update_mode_operation(HCI_ROLE_UNKNOWN, &address_with_type.bda, status);
 }
 
-void gatt_notify_conn_update(const RawAddress& remote, uint16_t interval, uint16_t latency,
-                             uint16_t timeout, tHCI_STATUS status);
 void acl_ble_update_event_received(tHCI_STATUS status, uint16_t handle, uint16_t interval,
                                    uint16_t latency, uint16_t timeout) {
   l2cble_process_conn_update_evt(handle, status, interval, latency, timeout);
diff --git a/system/stack/btm/btm_dev.cc b/system/stack/btm/btm_dev.cc
index cdc7e27f91..c791c03319 100644
--- a/system/stack/btm/btm_dev.cc
+++ b/system/stack/btm/btm_dev.cc
@@ -45,6 +45,7 @@
 #include "stack/include/btm_ble_privacy.h"
 #include "stack/include/btm_client_interface.h"
 #include "stack/include/btm_log_history.h"
+#include "stack/include/gatt_api.h"
 #include "stack/include/l2cap_interface.h"
 #include "types/raw_address.h"
 
@@ -54,7 +55,6 @@
 using namespace bluetooth;
 
 extern tBTM_CB btm_cb;
-void gatt_consolidate(const RawAddress& identity_addr, const RawAddress& rpa);
 
 namespace {
 
diff --git a/system/stack/gatt/att_protocol.cc b/system/stack/gatt/att_protocol.cc
index 60bf695167..8360b81406 100644
--- a/system/stack/gatt/att_protocol.cc
+++ b/system/stack/gatt/att_protocol.cc
@@ -37,10 +37,6 @@
 #define GATT_OP_CODE_SIZE 1
 #define GATT_START_END_HANDLE_SIZE 4
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
-using base::StringPrintf;
 using bluetooth::Uuid;
 using namespace bluetooth;
 
diff --git a/system/stack/gatt/gatt_api.cc b/system/stack/gatt/gatt_api.cc
index 7ed0fe0516..3f2c7136a9 100644
--- a/system/stack/gatt/gatt_api.cc
+++ b/system/stack/gatt/gatt_api.cc
@@ -51,9 +51,6 @@
 #include "types/bt_transport.h"
 #include "types/raw_address.h"
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
 using namespace bluetooth::legacy::stack::sdp;
 using namespace bluetooth;
 
@@ -63,7 +60,7 @@ using bluetooth::Uuid;
  * Add a service handle range to the list in descending order of the start
  * handle. Return reference to the newly added element.
  **/
-tGATT_HDL_LIST_ELEM& gatt_add_an_item_to_list(uint16_t s_handle) {
+static tGATT_HDL_LIST_ELEM& gatt_add_an_item_to_list(uint16_t s_handle) {
   auto lst_ptr = gatt_cb.hdl_list_info;
   auto it = lst_ptr->begin();
   for (; it != lst_ptr->end(); it++) {
@@ -353,7 +350,7 @@ tGATT_STATUS GATTS_AddService(tGATT_IF gatt_if, btgatt_db_element_t* service, in
   return GATT_SERVICE_STARTED;
 }
 
-bool is_active_service(const Uuid& app_uuid128, Uuid* p_svc_uuid, uint16_t start_handle) {
+static bool is_active_service(const Uuid& app_uuid128, Uuid* p_svc_uuid, uint16_t start_handle) {
   for (auto& info : *gatt_cb.srv_list_info) {
     Uuid* p_this_uuid = gatts_get_service_uuid(info.p_db);
 
diff --git a/system/stack/gatt/gatt_attr.cc b/system/stack/gatt/gatt_attr.cc
index a4b2935c52..a9d9e12b66 100644
--- a/system/stack/gatt/gatt_attr.cc
+++ b/system/stack/gatt/gatt_attr.cc
@@ -40,10 +40,6 @@
 #include "types/bluetooth/uuid.h"
 #include "types/raw_address.h"
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
-using base::StringPrintf;
 using bluetooth::Uuid;
 using namespace bluetooth;
 
@@ -192,8 +188,8 @@ static tGATT_PROFILE_CLCB* gatt_profile_find_clcb_by_bd_addr(const RawAddress& b
  *                  block.
  *
  ******************************************************************************/
-tGATT_PROFILE_CLCB* gatt_profile_clcb_alloc(tCONN_ID conn_id, const RawAddress& bda,
-                                            tBT_TRANSPORT tranport) {
+static tGATT_PROFILE_CLCB* gatt_profile_clcb_alloc(tCONN_ID conn_id, const RawAddress& bda,
+                                                   tBT_TRANSPORT tranport) {
   uint8_t i_clcb = 0;
   tGATT_PROFILE_CLCB* p_clcb = NULL;
 
@@ -224,13 +220,13 @@ tGATT_PROFILE_CLCB* gatt_profile_clcb_alloc(tCONN_ID conn_id, const RawAddress&
  * Returns          void
  *
  ******************************************************************************/
-void gatt_profile_clcb_dealloc(tGATT_PROFILE_CLCB* p_clcb) {
+static void gatt_profile_clcb_dealloc(tGATT_PROFILE_CLCB* p_clcb) {
   memset(p_clcb, 0, sizeof(tGATT_PROFILE_CLCB));
 }
 
 /** GAP Attributes Database Request callback */
-tGATT_STATUS read_attr_value(tCONN_ID conn_id, uint16_t handle, tGATT_VALUE* p_value,
-                             bool is_long) {
+static tGATT_STATUS read_attr_value(tCONN_ID conn_id, uint16_t handle, tGATT_VALUE* p_value,
+                                    bool is_long) {
   uint8_t* p = p_value->value;
 
   if (handle == gatt_cb.handle_sr_supported_feat) {
@@ -271,8 +267,8 @@ tGATT_STATUS read_attr_value(tCONN_ID conn_id, uint16_t handle, tGATT_VALUE* p_v
 }
 
 /** GAP Attributes Database Read/Read Blob Request process */
-tGATT_STATUS proc_read_req(tCONN_ID conn_id, tGATTS_REQ_TYPE, tGATT_READ_REQ* p_data,
-                           tGATTS_RSP* p_rsp) {
+static tGATT_STATUS proc_read_req(tCONN_ID conn_id, tGATTS_REQ_TYPE, tGATT_READ_REQ* p_data,
+                                  tGATTS_RSP* p_rsp) {
   if (p_data->is_long) {
     p_rsp->attr_value.offset = p_data->offset;
   }
@@ -283,7 +279,7 @@ tGATT_STATUS proc_read_req(tCONN_ID conn_id, tGATTS_REQ_TYPE, tGATT_READ_REQ* p_
 }
 
 /** GAP ATT server process a write request */
-tGATT_STATUS proc_write_req(tCONN_ID conn_id, tGATTS_REQ_TYPE, tGATT_WRITE_REQ* p_data) {
+static tGATT_STATUS proc_write_req(tCONN_ID conn_id, tGATTS_REQ_TYPE, tGATT_WRITE_REQ* p_data) {
   uint16_t handle = p_data->handle;
 
   /* GATT_UUID_SERVER_SUP_FEAT*/
diff --git a/system/stack/gatt/gatt_auth.cc b/system/stack/gatt/gatt_auth.cc
index fc11e2570c..4323c8ed13 100644
--- a/system/stack/gatt/gatt_auth.cc
+++ b/system/stack/gatt/gatt_auth.cc
@@ -39,9 +39,6 @@
 #include "stack/include/btm_status.h"
 #include "types/raw_address.h"
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
 using namespace bluetooth;
 
 /*******************************************************************************
@@ -281,7 +278,7 @@ tGATT_SEC_ACTION gatt_get_sec_act(tGATT_TCB* p_tcb) {
  * This routine determine the security action based on auth_request and current
  * link status. Returns tGATT_SEC_ACTION (security action)
  */
-tGATT_SEC_ACTION gatt_determine_sec_act(tGATT_CLCB* p_clcb) {
+static tGATT_SEC_ACTION gatt_determine_sec_act(tGATT_CLCB* p_clcb) {
   tGATT_SEC_ACTION act = GATT_SEC_OK;
   tGATT_TCB* p_tcb = p_clcb->p_tcb;
   tGATT_AUTH_REQ auth_req = p_clcb->auth_req;
diff --git a/system/stack/gatt/gatt_cl.cc b/system/stack/gatt/gatt_cl.cc
index 61fb47fa40..50844962f4 100644
--- a/system/stack/gatt/gatt_cl.cc
+++ b/system/stack/gatt/gatt_cl.cc
@@ -52,9 +52,6 @@
 
 #define L2CAP_PKT_OVERHEAD 4
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
 using namespace bluetooth;
 using bluetooth::Uuid;
 using bluetooth::eatt::EattChannel;
@@ -277,6 +274,7 @@ void gatt_act_write(tGATT_CLCB* p_clcb, uint8_t sec_act) {
       return;
   }
 }
+
 /*******************************************************************************
  *
  * Function         gatt_send_queue_write_cancel
@@ -299,6 +297,7 @@ void gatt_send_queue_write_cancel(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, tGATT_EXEC
     gatt_end_operation(p_clcb, rt, NULL);
   }
 }
+
 /*******************************************************************************
  *
  * Function         gatt_check_write_long_terminate
@@ -308,7 +307,8 @@ void gatt_send_queue_write_cancel(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, tGATT_EXEC
  * Returns          true: write long is terminated; false keep sending.
  *
  ******************************************************************************/
-bool gatt_check_write_long_terminate(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, tGATT_VALUE* p_rsp_value) {
+static bool gatt_check_write_long_terminate(tGATT_TCB& tcb, tGATT_CLCB* p_clcb,
+                                            tGATT_VALUE* p_rsp_value) {
   tGATT_VALUE* p_attr = (tGATT_VALUE*)p_clcb->p_attr_buf;
   bool terminate = false;
   tGATT_EXEC_FLAG flag = GATT_PREP_WRITE_EXEC;
@@ -389,8 +389,8 @@ void gatt_send_prepare_write(tGATT_TCB& tcb, tGATT_CLCB* p_clcb) {
  * Returns          void
  *
  ******************************************************************************/
-void gatt_process_find_type_value_rsp(tGATT_TCB& /* tcb */, tGATT_CLCB* p_clcb, uint16_t len,
-                                      uint8_t* p_data) {
+static void gatt_process_find_type_value_rsp(tGATT_TCB& /* tcb */, tGATT_CLCB* p_clcb, uint16_t len,
+                                             uint8_t* p_data) {
   tGATT_DISC_RES result;
   uint8_t* p = p_data;
 
@@ -434,8 +434,8 @@ void gatt_process_find_type_value_rsp(tGATT_TCB& /* tcb */, tGATT_CLCB* p_clcb,
  * Returns          void
  *
  ******************************************************************************/
-void gatt_process_read_info_rsp(tGATT_TCB& /* tcb */, tGATT_CLCB* p_clcb, uint8_t /* op_code */,
-                                uint16_t len, uint8_t* p_data) {
+static void gatt_process_read_info_rsp(tGATT_TCB& /* tcb */, tGATT_CLCB* p_clcb,
+                                       uint8_t /* op_code */, uint16_t len, uint8_t* p_data) {
   tGATT_DISC_RES result;
   uint8_t *p = p_data, uuid_len = 0, type;
 
@@ -481,6 +481,7 @@ void gatt_process_read_info_rsp(tGATT_TCB& /* tcb */, tGATT_CLCB* p_clcb, uint8_
   /* initiate another request */
   gatt_act_discovery(p_clcb);
 }
+
 /*******************************************************************************
  *
  * Function         gatt_proc_disc_error_rsp
@@ -491,8 +492,8 @@ void gatt_process_read_info_rsp(tGATT_TCB& /* tcb */, tGATT_CLCB* p_clcb, uint8_
  * Returns          void.
  *
  ******************************************************************************/
-void gatt_proc_disc_error_rsp(tGATT_TCB& /* tcb */, tGATT_CLCB* p_clcb, uint8_t opcode,
-                              uint16_t /* handle */, uint8_t reason) {
+static void gatt_proc_disc_error_rsp(tGATT_TCB& /* tcb */, tGATT_CLCB* p_clcb, uint8_t opcode,
+                                     uint16_t /* handle */, uint8_t reason) {
   tGATT_STATUS status = (tGATT_STATUS)reason;
 
   log::verbose("reason: {:02x} cmd_code {:04x}", reason, opcode);
@@ -525,8 +526,8 @@ void gatt_proc_disc_error_rsp(tGATT_TCB& /* tcb */, tGATT_CLCB* p_clcb, uint8_t
  * Returns          void
  *
  ******************************************************************************/
-void gatt_process_error_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t /* op_code */, uint16_t len,
-                            uint8_t* p_data) {
+static void gatt_process_error_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t /* op_code */,
+                                   uint16_t len, uint8_t* p_data) {
   uint8_t opcode, *p = p_data;
   uint8_t reason;
   uint16_t handle;
@@ -569,6 +570,7 @@ void gatt_process_error_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t /* op_co
     }
   }
 }
+
 /*******************************************************************************
  *
  * Function         gatt_process_prep_write_rsp
@@ -579,8 +581,8 @@ void gatt_process_error_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t /* op_co
  * Returns          void
  *
  ******************************************************************************/
-void gatt_process_prep_write_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t op_code, uint16_t len,
-                                 uint8_t* p_data) {
+static void gatt_process_prep_write_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t op_code,
+                                        uint16_t len, uint8_t* p_data) {
   uint8_t* p = p_data;
 
   tGATT_VALUE value = {
@@ -630,8 +632,8 @@ void gatt_process_prep_write_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t op_
  * Returns          void
  *
  ******************************************************************************/
-void gatt_process_notification(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, uint16_t len,
-                               uint8_t* p_data) {
+static void gatt_process_notification(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, uint16_t len,
+                                      uint8_t* p_data) {
   tGATT_VALUE value = {};
   tGATT_REG* p_reg;
   tCONN_ID conn_id;
@@ -815,8 +817,8 @@ void gatt_process_notification(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, ui
  * Returns          void
  *
  ******************************************************************************/
-void gatt_process_read_by_type_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t op_code,
-                                   uint16_t len, uint8_t* p_data) {
+static void gatt_process_read_by_type_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t op_code,
+                                          uint16_t len, uint8_t* p_data) {
   tGATT_DISC_RES result;
   tGATT_DISC_VALUE record_value;
   uint8_t *p = p_data, value_len, handle_len = 2;
@@ -1027,8 +1029,8 @@ void gatt_process_read_by_type_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t o
  * Returns          void
  *
  ******************************************************************************/
-void gatt_process_read_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t /* op_code */, uint16_t len,
-                           uint8_t* p_data) {
+static void gatt_process_read_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t /* op_code */,
+                                  uint16_t len, uint8_t* p_data) {
   uint16_t offset = p_clcb->counter;
   uint8_t* p = p_data;
 
@@ -1110,7 +1112,10 @@ void gatt_process_read_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint8_t /* op_cod
  * Returns          void
  *
  ******************************************************************************/
-void gatt_process_handle_rsp(tGATT_CLCB* p_clcb) { gatt_end_operation(p_clcb, GATT_SUCCESS, NULL); }
+static void gatt_process_handle_rsp(tGATT_CLCB* p_clcb) {
+  gatt_end_operation(p_clcb, GATT_SUCCESS, NULL);
+}
+
 /*******************************************************************************
  *
  * Function         gatt_process_mtu_rsp
@@ -1121,7 +1126,8 @@ void gatt_process_handle_rsp(tGATT_CLCB* p_clcb) { gatt_end_operation(p_clcb, GA
  * Returns          void
  *
  ******************************************************************************/
-void gatt_process_mtu_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint16_t len, uint8_t* p_data) {
+static void gatt_process_mtu_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint16_t len,
+                                 uint8_t* p_data) {
   uint16_t mtu;
   tGATT_STATUS status = GATT_SUCCESS;
 
@@ -1173,7 +1179,7 @@ void gatt_process_mtu_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, uint16_t len, uint
  * Returns          response code.
  *
  ******************************************************************************/
-uint8_t gatt_cmd_to_rsp_code(uint8_t cmd_code) {
+static uint8_t gatt_cmd_to_rsp_code(uint8_t cmd_code) {
   uint8_t rsp_code = 0;
 
   if (cmd_code > 1 && cmd_code != GATT_CMD_WRITE) {
diff --git a/system/stack/gatt/gatt_db.cc b/system/stack/gatt/gatt_db.cc
index 2141fd47eb..cd55ffdb71 100644
--- a/system/stack/gatt/gatt_db.cc
+++ b/system/stack/gatt/gatt_db.cc
@@ -31,9 +31,6 @@
 #include "stack/include/l2cap_types.h"
 #include "types/bluetooth/uuid.h"
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
 using bluetooth::Uuid;
 using namespace bluetooth;
 
@@ -442,7 +439,7 @@ uint16_t gatts_add_char_descr(tGATT_SVC_DB& db, tGATT_PERM perm, const Uuid& des
 /******************************************************************************/
 /* Service Attribute Database Query Utility Functions */
 /******************************************************************************/
-tGATT_ATTR* find_attr_by_handle(tGATT_SVC_DB* p_db, uint16_t handle) {
+static tGATT_ATTR* find_attr_by_handle(tGATT_SVC_DB* p_db, uint16_t handle) {
   if (!p_db) {
     return nullptr;
   }
diff --git a/system/stack/gatt/gatt_int.h b/system/stack/gatt/gatt_int.h
index 59dc338b5d..88c8b88ab6 100644
--- a/system/stack/gatt/gatt_int.h
+++ b/system/stack/gatt/gatt_int.h
@@ -499,10 +499,6 @@ bool gatt_act_connect(tGATT_REG* p_reg, const RawAddress& bd_addr, tBT_TRANSPORT
                       int8_t initiating_phys);
 bool gatt_act_connect(tGATT_REG* p_reg, const RawAddress& bd_addr, tBLE_ADDR_TYPE addr_type,
                       tBT_TRANSPORT transport, int8_t initiating_phys);
-bool gatt_connect(const RawAddress& rem_bda, tGATT_TCB* p_tcb, tBT_TRANSPORT transport,
-                  uint8_t initiating_phys, tGATT_IF gatt_if);
-bool gatt_connect(const RawAddress& rem_bda, tGATT_TCB* p_tcb, tBLE_ADDR_TYPE addr_type,
-                  tBT_TRANSPORT transport, uint8_t initiating_phys, tGATT_IF gatt_if);
 void gatt_data_process(tGATT_TCB& p_tcb, uint16_t cid, BT_HDR* p_buf);
 void gatt_update_app_use_link_flag(tGATT_IF gatt_if, tGATT_TCB* p_tcb, bool is_add,
                                    bool check_acl_link);
@@ -692,10 +688,20 @@ tGATT_STATUS gatts_write_attr_perm_check(tGATT_SVC_DB* p_db, uint8_t op_code, ui
 tGATT_STATUS gatts_read_attr_perm_check(tGATT_SVC_DB* p_db, bool is_long, uint16_t handle,
                                         tGATT_SEC_FLAG sec_flag, uint8_t key_size);
 bluetooth::Uuid* gatts_get_service_uuid(tGATT_SVC_DB* p_db);
+void gatts_proc_srv_chg_ind_ack(tGATT_TCB tcb);
 
 /* gatt_sr_hash.cc */
 Octet16 gatts_calculate_database_hash(std::list<tGATT_SRV_LIST_ELEM>* lst_ptr);
 
+namespace bluetooth {
+namespace legacy {
+namespace testing {
+BT_HDR* attp_build_value_cmd(uint16_t payload_size, uint8_t op_code, uint16_t handle,
+                             uint16_t offset, uint16_t len, uint8_t* p_data);
+}  // namespace testing
+}  // namespace legacy
+}  // namespace bluetooth
+
 namespace fmt {
 template <>
 struct formatter<tGATT_CH_STATE> : enum_formatter<tGATT_CH_STATE> {};
diff --git a/system/stack/gatt/gatt_main.cc b/system/stack/gatt/gatt_main.cc
index f5591d2194..2cf2c42a51 100644
--- a/system/stack/gatt/gatt_main.cc
+++ b/system/stack/gatt/gatt_main.cc
@@ -45,15 +45,13 @@
 #include "stack/include/bt_psm_types.h"
 #include "stack/include/bt_types.h"
 #include "stack/include/btm_client_interface.h"
+#include "stack/include/gatt_api.h"
 #include "stack/include/l2cap_acl_interface.h"
 #include "stack/include/l2cap_interface.h"
 #include "stack/include/l2cdefs.h"
 #include "stack/include/srvc_api.h"  // tDIS_VALUE
 #include "types/raw_address.h"
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
 using bluetooth::eatt::EattExtension;
 using namespace bluetooth;
 
@@ -218,8 +216,8 @@ void gatt_free(void) {
  * Returns          true if connection is started, otherwise return false.
  *
  ******************************************************************************/
-bool gatt_connect(const RawAddress& rem_bda, tBLE_ADDR_TYPE addr_type, tGATT_TCB* p_tcb,
-                  tBT_TRANSPORT transport, uint8_t /* initiating_phys */, tGATT_IF gatt_if) {
+static bool gatt_connect(const RawAddress& rem_bda, tBLE_ADDR_TYPE addr_type, tGATT_TCB* p_tcb,
+                         tBT_TRANSPORT transport, uint8_t /* initiating_phys */, tGATT_IF gatt_if) {
   if (gatt_get_ch_state(p_tcb) != GATT_CH_OPEN) {
     gatt_set_ch_state(p_tcb, GATT_CH_CONN);
   }
@@ -240,11 +238,6 @@ bool gatt_connect(const RawAddress& rem_bda, tBLE_ADDR_TYPE addr_type, tGATT_TCB
   return connection_manager::create_le_connection(gatt_if, rem_bda, addr_type);
 }
 
-bool gatt_connect(const RawAddress& rem_bda, tGATT_TCB* p_tcb, tBT_TRANSPORT transport,
-                  uint8_t initiating_phys, tGATT_IF gatt_if) {
-  return gatt_connect(rem_bda, BLE_ADDR_PUBLIC, p_tcb, transport, initiating_phys, gatt_if);
-}
-
 /*******************************************************************************
  *
  * Function         gatt_cancel_connect
diff --git a/system/stack/gatt/gatt_sr.cc b/system/stack/gatt/gatt_sr.cc
index 7e12f30e7d..8b67f2e204 100644
--- a/system/stack/gatt/gatt_sr.cc
+++ b/system/stack/gatt/gatt_sr.cc
@@ -44,9 +44,6 @@
 #define GATT_MTU_REQ_MIN_LEN 2
 #define L2CAP_PKT_OVERHEAD 4
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
 using bluetooth::Uuid;
 using bluetooth::eatt::EattChannel;
 using bluetooth::eatt::EattExtension;
@@ -107,7 +104,7 @@ uint32_t gatt_sr_enqueue_cmd(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, uint
  * Returns          true if empty, false if there is pending command.
  *
  ******************************************************************************/
-bool gatt_sr_cmd_empty(tGATT_TCB& tcb, uint16_t cid) {
+static bool gatt_sr_cmd_empty(tGATT_TCB& tcb, uint16_t cid) {
   if (cid == tcb.att_lcid) {
     return tcb.sr_cmd.op_code == 0;
   }
@@ -369,8 +366,8 @@ tGATT_STATUS gatt_sr_process_app_rsp(tGATT_TCB& tcb, tGATT_IF gatt_if, uint32_t
  * Returns          void
  *
  ******************************************************************************/
-void gatt_process_exec_write_req(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, uint16_t len,
-                                 uint8_t* p_data) {
+static void gatt_process_exec_write_req(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, uint16_t len,
+                                        uint8_t* p_data) {
   uint8_t *p = p_data, flag;
   uint32_t trans_id = 0;
   tGATT_IF gatt_if;
@@ -441,8 +438,8 @@ void gatt_process_exec_write_req(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code,
  * Returns          void
  *
  ******************************************************************************/
-void gatt_process_read_multi_req(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, uint16_t len,
-                                 uint8_t* p_data) {
+static void gatt_process_read_multi_req(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, uint16_t len,
+                                        uint8_t* p_data) {
   uint32_t trans_id;
   uint16_t handle = 0, ll = len;
   uint8_t* p = p_data;
@@ -730,8 +727,8 @@ static tGATT_STATUS gatts_validate_packet_format(uint8_t op_code, uint16_t& len,
  * Returns          void
  *
  ******************************************************************************/
-void gatts_process_primary_service_req(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, uint16_t len,
-                                       uint8_t* p_data) {
+static void gatts_process_primary_service_req(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code,
+                                              uint16_t len, uint8_t* p_data) {
   uint16_t s_hdl = 0, e_hdl = 0;
   Uuid uuid = Uuid::kEmpty;
 
@@ -1144,8 +1141,8 @@ static void gatts_process_read_req(tGATT_TCB& tcb, uint16_t cid, tGATT_SRV_LIST_
  * Returns          void
  *
  ******************************************************************************/
-void gatts_process_attribute_req(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, uint16_t len,
-                                 uint8_t* p_data) {
+static void gatts_process_attribute_req(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, uint16_t len,
+                                        uint8_t* p_data) {
   uint16_t handle = 0;
   uint8_t* p = p_data;
   tGATT_STATUS status = GATT_INVALID_HANDLE;
@@ -1291,7 +1288,7 @@ static bool gatts_proc_ind_ack(tGATT_TCB& tcb, uint16_t ack_handle) {
  * Returns          void
  *
  ******************************************************************************/
-void gatts_process_value_conf(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code) {
+static void gatts_process_value_conf(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code) {
   uint16_t handle;
 
   if (!gatt_tcb_find_indicate_handle(tcb, cid, &handle)) {
diff --git a/system/stack/gatt/gatt_utils.cc b/system/stack/gatt/gatt_utils.cc
index d159bbd794..5be17c302a 100644
--- a/system/stack/gatt/gatt_utils.cc
+++ b/system/stack/gatt/gatt_utils.cc
@@ -45,16 +45,12 @@
 #include "stack/include/bt_psm_types.h"
 #include "stack/include/bt_types.h"
 #include "stack/include/bt_uuid16.h"
+#include "stack/include/btm_sec_api.h"
 #include "stack/include/l2cdefs.h"
 #include "stack/include/sdp_api.h"
 #include "types/bluetooth/uuid.h"
 #include "types/raw_address.h"
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
-uint8_t btm_ble_read_sec_key_size(const RawAddress& bd_addr);
-
 using namespace bluetooth::legacy::stack::sdp;
 using namespace bluetooth;
 
@@ -108,7 +104,7 @@ uint16_t gatt_get_local_mtu(void) {
   return ATT_MTU_DEFAULT;
 }
 
-uint16_t gatt_get_max_phy_channel() {
+static uint16_t gatt_get_max_phy_channel() {
   static const uint16_t MAX_PHY_CHANNEL =
           std::min(std::max(osi_property_get_int32(
                                     "bluetooth.core.le.max_number_of_concurrent_connections", 0),
@@ -126,7 +122,7 @@ uint16_t gatt_get_max_phy_channel() {
  * Returns       None
  *
  ******************************************************************************/
-void gatt_free_pending_ind(tGATT_TCB* p_tcb) {
+static void gatt_free_pending_ind(tGATT_TCB* p_tcb) {
   log::verbose("");
 
   if (p_tcb->pending_ind_q == NULL) {
@@ -377,28 +373,6 @@ tGATTS_SRV_CHG* gatt_is_bda_in_the_srv_chg_clt_list(const RawAddress& bda) {
 
 /*******************************************************************************
  *
- * Function         gatt_is_bda_connected
- *
- * Description
- *
- * Returns          GATT_INDEX_INVALID if not found. Otherwise index to the tcb.
- *
- ******************************************************************************/
-bool gatt_is_bda_connected(const RawAddress& bda) {
-  uint8_t i = 0;
-  bool connected = false;
-
-  for (i = 0; i < gatt_get_max_phy_channel(); i++) {
-    if (gatt_cb.tcb[i].in_use && gatt_cb.tcb[i].peer_bda == bda) {
-      connected = true;
-      break;
-    }
-  }
-  return connected;
-}
-
-/*******************************************************************************
- *
  * Function         gatt_find_i_tcb_by_addr
  *
  * Description      Search for an empty tcb entry, and return the index.
@@ -406,7 +380,7 @@ bool gatt_is_bda_connected(const RawAddress& bda) {
  * Returns          GATT_INDEX_INVALID if not found. Otherwise index to the tcb.
  *
  ******************************************************************************/
-uint8_t gatt_find_i_tcb_by_addr(const RawAddress& bda, tBT_TRANSPORT transport) {
+static uint8_t gatt_find_i_tcb_by_addr(const RawAddress& bda, tBT_TRANSPORT transport) {
   uint8_t i = 0;
 
   for (; i < gatt_get_max_phy_channel(); i++) {
@@ -794,8 +768,6 @@ void gatt_rsp_timeout(void* data) {
   }
 }
 
-void gatts_proc_srv_chg_ind_ack(tGATT_TCB tcb);
-
 /*******************************************************************************
  *
  * Function         gatt_indication_confirmation_timeout
diff --git a/system/stack/include/gatt_api.h b/system/stack/include/gatt_api.h
index e51ddc0825..54ecfdccb3 100644
--- a/system/stack/include/gatt_api.h
+++ b/system/stack/include/gatt_api.h
@@ -1272,6 +1272,10 @@ void gatt_init(void);
 // Frees resources used by the GATT profile.
 void gatt_free(void);
 
+void gatt_consolidate(const RawAddress& identity_addr, const RawAddress& rpa);
+void gatt_notify_conn_update(const RawAddress& remote, uint16_t interval, uint16_t latency,
+                             uint16_t timeout, tHCI_STATUS status);
+
 // Link encryption complete notification for all encryption process
 // initiated outside GATT.
 void gatt_notify_enc_cmpl(const RawAddress& bd_addr);
@@ -1283,6 +1287,8 @@ void gatt_reset_bgdev_list(bool after_reset);
 // Initialize GATTS list of bonded device service change updates.
 void gatt_load_bonded(void);
 
+void gatt_tcb_dump(int fd);
+
 namespace fmt {
 template <>
 struct formatter<GattStatus> : enum_formatter<GattStatus> {};
diff --git a/system/stack/test/gatt/gatt_sr_test.cc b/system/stack/test/gatt/gatt_sr_test.cc
index 7992f876ea..285aa23ea8 100644
--- a/system/stack/test/gatt/gatt_sr_test.cc
+++ b/system/stack/test/gatt/gatt_sr_test.cc
@@ -20,6 +20,7 @@
 #include <cstdint>
 #include <memory>
 
+#include "stack/connection_manager/connection_manager.h"
 #include "stack/gatt/gatt_int.h"
 #include "stack/include/bt_hdr.h"
 #include "stack/include/main_thread.h"
@@ -120,12 +121,8 @@ tGATT_STATUS gatts_write_attr_perm_check(tGATT_SVC_DB* /*p_db*/, uint8_t /*op_co
 void gatt_update_app_use_link_flag(tGATT_IF /*gatt_if*/, tGATT_TCB* /*p_tcb*/, bool /*is_add*/,
                                    bool /*check_acl_link*/) {}
 bluetooth::common::MessageLoopThread* get_main_thread() { return nullptr; }
-void l2cble_set_fixed_channel_tx_data_length(const RawAddress& /*remote_bda*/, uint16_t /*fix_cid*/,
-                                             uint16_t /*tx_mtu*/) {}
-void L2CA_SetLeFixedChannelTxDataLength(const RawAddress& /*remote_bda*/, uint16_t /*fix_cid*/,
-                                        uint16_t /*tx_mtu*/) {}
-void ApplicationRequestCallback(uint16_t conn_id, uint32_t trans_id, tGATTS_REQ_TYPE type,
-                                tGATTS_DATA* p_data) {
+static void ApplicationRequestCallback(uint16_t conn_id, uint32_t trans_id, tGATTS_REQ_TYPE type,
+                                       tGATTS_DATA* p_data) {
   test_state_.application_request_callback.conn_id_ = conn_id;
   test_state_.application_request_callback.trans_id_ = trans_id;
   test_state_.application_request_callback.type_ = type;
diff --git a/system/stack/test/gatt/mock_gatt_utils_ref.cc b/system/stack/test/gatt/mock_gatt_utils_ref.cc
index 2f392b3e90..fcd758640f 100644
--- a/system/stack/test/gatt/mock_gatt_utils_ref.cc
+++ b/system/stack/test/gatt/mock_gatt_utils_ref.cc
@@ -63,9 +63,3 @@ uint32_t gatt_sr_enqueue_cmd(tGATT_TCB& tcb, uint16_t cid, uint8_t op_code, uint
   return 0x0000;
 }
 void gatt_dequeue_sr_cmd(tGATT_TCB& tcb, uint16_t cid) {}
-
-/** stack/l2cap/l2c_ble.cc */
-void l2cble_set_fixed_channel_tx_data_length(const RawAddress& remote_bda, uint16_t fix_cid,
-                                             uint16_t tx_mtu) {}
-void L2CA_SetLeFixedChannelTxDataLength(const RawAddress& remote_bda, uint16_t fix_cid,
-                                        uint16_t tx_mtu) {}
diff --git a/system/test/mock/mock_stack_gatt.cc b/system/test/mock/mock_stack_gatt.cc
index 297ec5747a..a6dfb1d52b 100644
--- a/system/test/mock/mock_stack_gatt.cc
+++ b/system/test/mock/mock_stack_gatt.cc
@@ -26,17 +26,8 @@
 #include "test/common/mock_functions.h"
 #include "types/bluetooth/uuid.h"
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
 using namespace bluetooth;
 
-tGATT_HDL_LIST_ELEM elem;  // gatt_add_an_item_to_list
-
-tGATT_HDL_LIST_ELEM& gatt_add_an_item_to_list(uint16_t /* s_handle */) {
-  inc_func_call_count(__func__);
-  return elem;
-}
 tGATT_STATUS GATTC_Discover(uint16_t /* conn_id */, tGATT_DISC_TYPE /* disc_type */,
                             uint16_t /* start_handle */, uint16_t /* end_handle */,
                             const Uuid& /* uuid */) {
diff --git a/system/test/mock/mock_stack_gatt_api.cc b/system/test/mock/mock_stack_gatt_api.cc
index cde6c3fa6b..2822d79420 100644
--- a/system/test/mock/mock_stack_gatt_api.cc
+++ b/system/test/mock/mock_stack_gatt_api.cc
@@ -27,9 +27,6 @@
 
 #include "test/common/mock_functions.h"
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
 // Original usings
 using bluetooth::Uuid;
 
@@ -66,8 +63,6 @@ struct GATT_GetConnectionInfor GATT_GetConnectionInfor;
 struct GATT_Register GATT_Register;
 struct GATT_SetIdleTimeout GATT_SetIdleTimeout;
 struct GATT_StartIf GATT_StartIf;
-// struct gatt_add_an_item_to_list gatt_add_an_item_to_list;
-struct is_active_service is_active_service;
 
 }  // namespace stack_gatt_api
 }  // namespace mock
@@ -99,9 +94,6 @@ tGATT_STATUS GATT_Disconnect::return_value = GATT_SUCCESS;
 bool GATT_GetConnIdIfConnected::return_value = false;
 bool GATT_GetConnectionInfor::return_value = false;
 tGATT_IF GATT_Register::return_value = 0;
-// tGATT_HDL_LIST_ELEM gatt_add_an_item_to_list::return_value = { .svc_db = {},
-// .asgn_range = {}};
-bool is_active_service::return_value = false;
 
 }  // namespace stack_gatt_api
 }  // namespace mock
@@ -230,14 +222,6 @@ void GATT_StartIf(tGATT_IF gatt_if) {
   inc_func_call_count(__func__);
   test::mock::stack_gatt_api::GATT_StartIf(gatt_if);
 }
-// tGATT_HDL_LIST_ELEM& gatt_add_an_item_to_list(uint16_t s_handle) {
-//   inc_func_call_count(__func__);
-//   return test::mock::stack_gatt_api::gatt_add_an_item_to_list(s_handle);
-// }
-bool is_active_service(const Uuid& app_uuid128, Uuid* p_svc_uuid, uint16_t start_handle) {
-  inc_func_call_count(__func__);
-  return test::mock::stack_gatt_api::is_active_service(app_uuid128, p_svc_uuid, start_handle);
-}
 // Mocked functions complete
 //
 bool GATT_Connect(tGATT_IF gatt_if, const RawAddress& bd_addr, tBTM_BLE_CONN_TYPE connection_type,
diff --git a/system/test/mock/mock_stack_gatt_api.h b/system/test/mock/mock_stack_gatt_api.h
index 74bf566f2f..63d4e0f7d5 100644
--- a/system/test/mock/mock_stack_gatt_api.h
+++ b/system/test/mock/mock_stack_gatt_api.h
@@ -398,33 +398,6 @@ struct GATT_StartIf {
 };
 extern struct GATT_StartIf GATT_StartIf;
 
-// // Name: gatt_add_an_item_to_list
-// // Params: uint16_t s_handle
-// // Return: tGATT_HDL_LIST_ELEM&
-// struct gatt_add_an_item_to_list {
-//   static tGATT_HDL_LIST_ELEM return_value;
-//   std::function<tGATT_HDL_LIST_ELEM&(uint16_t s_handle)> body{
-//       [](uint16_t s_handle) { return return_value; }};
-//   tGATT_HDL_LIST_ELEM& operator()(uint16_t s_handle) { return body(s_handle);
-//   };
-// };
-// extern struct gatt_add_an_item_to_list gatt_add_an_item_to_list;
-
-// Name: is_active_service
-// Params: const Uuid& app_uuid128, Uuid* p_svc_uuid, uint16_t start_handle
-// Return: bool
-struct is_active_service {
-  static bool return_value;
-  std::function<bool(const Uuid& app_uuid128, Uuid* p_svc_uuid, uint16_t start_handle)> body{
-          [](const Uuid& /* app_uuid128 */, Uuid* /* p_svc_uuid */, uint16_t /* start_handle */) {
-            return return_value;
-          }};
-  bool operator()(const Uuid& app_uuid128, Uuid* p_svc_uuid, uint16_t start_handle) {
-    return body(app_uuid128, p_svc_uuid, start_handle);
-  }
-};
-extern struct is_active_service is_active_service;
-
 }  // namespace stack_gatt_api
 }  // namespace mock
 }  // namespace test
diff --git a/system/test/mock/mock_stack_gatt_attr.cc b/system/test/mock/mock_stack_gatt_attr.cc
index 6de9539644..4e46e87f2f 100644
--- a/system/test/mock/mock_stack_gatt_attr.cc
+++ b/system/test/mock/mock_stack_gatt_attr.cc
@@ -28,15 +28,11 @@
 #include "types/bt_transport.h"
 #include "types/raw_address.h"
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
 uint16_t gatt_profile_find_conn_id_by_bd_addr(const RawAddress& /* remote_bda */) {
   inc_func_call_count(__func__);
   return 0;
 }
-bool gatt_profile_get_eatt_support(const RawAddress& /* remote_bda */,
-                                   base::OnceCallback<void(const RawAddress&, bool)> /* cb */) {
+bool gatt_profile_get_eatt_support(const RawAddress& /* remote_bda */) {
   inc_func_call_count(__func__);
   return false;
 }
@@ -48,31 +44,10 @@ bool gatt_sr_is_cl_change_aware(tGATT_TCB& /* tcb */) {
   inc_func_call_count(__func__);
   return false;
 }
-tGATT_PROFILE_CLCB* gatt_profile_clcb_alloc(uint16_t /* conn_id */, const RawAddress& /* bda */,
-                                            tBT_TRANSPORT /* tranport */) {
-  inc_func_call_count(__func__);
-  return nullptr;
-}
-tGATT_STATUS proc_read_req(uint16_t /* conn_id */, tGATTS_REQ_TYPE, tGATT_READ_REQ* /* p_data */,
-                           tGATTS_RSP* /* p_rsp */) {
-  inc_func_call_count(__func__);
-  return GATT_SUCCESS;
-}
-tGATT_STATUS proc_write_req(uint16_t /* conn_id */, tGATTS_REQ_TYPE,
-                            tGATT_WRITE_REQ* /* p_data */) {
-  inc_func_call_count(__func__);
-  return GATT_SUCCESS;
-}
-tGATT_STATUS read_attr_value(uint16_t /* conn_id */, uint16_t /* handle */,
-                             tGATT_VALUE* /* p_value */, bool /* is_long */) {
-  inc_func_call_count(__func__);
-  return GATT_SUCCESS;
-}
 void GATT_ConfigServiceChangeCCC(const RawAddress& /* remote_bda */, bool /* enable */,
                                  tBT_TRANSPORT /* transport */) {
   inc_func_call_count(__func__);
 }
-void gatt_profile_clcb_dealloc(tGATT_PROFILE_CLCB* /* p_clcb */) { inc_func_call_count(__func__); }
 void gatt_profile_db_init(void) { inc_func_call_count(__func__); }
 void gatt_sr_init_cl_status(tGATT_TCB& /* tcb */) { inc_func_call_count(__func__); }
 void gatt_sr_update_cl_status(tGATT_TCB& /* tcb */, bool /* chg_aware */) {
diff --git a/system/test/mock/mock_stack_gatt_auth.cc b/system/test/mock/mock_stack_gatt_auth.cc
index 1e59e8152d..0351bf3e70 100644
--- a/system/test/mock/mock_stack_gatt_auth.cc
+++ b/system/test/mock/mock_stack_gatt_auth.cc
@@ -26,17 +26,10 @@
 #include "test/common/mock_functions.h"
 #include "types/raw_address.h"
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
 bool gatt_security_check_start(tGATT_CLCB* /* p_clcb */) {
   inc_func_call_count(__func__);
   return false;
 }
-tGATT_SEC_ACTION gatt_determine_sec_act(tGATT_CLCB* /* p_clcb */) {
-  inc_func_call_count(__func__);
-  return GATT_SEC_NONE;
-}
 tGATT_SEC_ACTION gatt_get_sec_act(tGATT_TCB* /* p_tcb */) {
   inc_func_call_count(__func__);
   return GATT_SEC_NONE;
diff --git a/system/test/mock/mock_stack_gatt_main.cc b/system/test/mock/mock_stack_gatt_main.cc
index 8ef0677c49..2c09b4a768 100644
--- a/system/test/mock/mock_stack_gatt_main.cc
+++ b/system/test/mock/mock_stack_gatt_main.cc
@@ -21,13 +21,11 @@
 
 #include "stack/gatt/gatt_int.h"
 #include "stack/include/bt_hdr.h"
+#include "stack/include/gatt_api.h"
 #include "stack/include/l2cap_interface.h"
 #include "test/common/mock_functions.h"
 #include "types/raw_address.h"
 
-// TODO(b/369381361) Enfore -Wmissing-prototypes
-#pragma GCC diagnostic ignored "-Wmissing-prototypes"
-
 void gatt_init(void) { inc_func_call_count(__func__); }
 bool gatt_act_connect(tGATT_REG* /* p_reg */, const RawAddress& /* bd_addr */,
                       tBLE_ADDR_TYPE /* addr_type */, tBT_TRANSPORT /* transport */,
@@ -35,12 +33,6 @@ bool gatt_act_connect(tGATT_REG* /* p_reg */, const RawAddress& /* bd_addr */,
   inc_func_call_count(__func__);
   return false;
 }
-bool gatt_connect(const RawAddress& /* rem_bda */, tGATT_TCB* /* p_tcb */,
-                  tBLE_ADDR_TYPE /* addr_type */, tBT_TRANSPORT /* transport */,
-                  uint8_t /* initiating_phys */, tGATT_IF /* gatt_if */) {
-  inc_func_call_count(__func__);
-  return false;
-}
 void gatt_cancel_connect(const RawAddress& /* bd_addr */, tBT_TRANSPORT /* transport*/) {
   inc_func_call_count(__func__);
 }
@@ -64,16 +56,6 @@ void gatt_consolidate(const RawAddress& /* identity_addr */, const RawAddress& /
 }
 void gatt_free(void) { inc_func_call_count(__func__); }
 void gatt_init_srv_chg(void) { inc_func_call_count(__func__); }
-void gatt_l2cif_config_cfm_cback(uint16_t /* lcid */, uint16_t /* initiator */,
-                                 tL2CAP_CFG_INFO* /* p_cfg */) {
-  inc_func_call_count(__func__);
-}
-void gatt_l2cif_config_ind_cback(uint16_t /* lcid */, tL2CAP_CFG_INFO* /* p_cfg */) {
-  inc_func_call_count(__func__);
-}
-void gatt_l2cif_disconnect_ind_cback(uint16_t /* lcid */, bool /* ack_needed */) {
-  inc_func_call_count(__func__);
-}
 void gatt_notify_conn_update(const RawAddress& /* remote */, uint16_t /* interval */,
                              uint16_t /* latency */, uint16_t /* timeout */,
                              tHCI_STATUS /* status */) {