diff --git a/components/bt/esp_ble_mesh/v1.1/api/models/include/esp_ble_mesh_mbt_model_api.h b/components/bt/esp_ble_mesh/v1.1/api/models/include/esp_ble_mesh_mbt_model_api.h
index 54b4f20aa8..38bfa103cf 100644
--- a/components/bt/esp_ble_mesh/v1.1/api/models/include/esp_ble_mesh_mbt_model_api.h
+++ b/components/bt/esp_ble_mesh/v1.1/api/models/include/esp_ble_mesh_mbt_model_api.h
@@ -14,7 +14,6 @@
 #define _BLE_MESH_MBT_DEPRECATE_WARN
 #warning "warning: 'All content in this document, including data structures and APIs, will be deprecated."
 #endif
-#endif /* CONFIG_BLE_MESH_MBT_SRV || CONFIG_BLE_MESH_MBT_CLI */
 
 #ifdef __cplusplus
 extern "C" {
@@ -773,4 +772,5 @@ esp_err_t esp_ble_mesh_mbt_server_get_blob_reception_progress(esp_ble_mesh_model
 }
 #endif
 
+#endif /* CONFIG_BLE_MESH_MBT_SRV || CONFIG_BLE_MESH_MBT_CLI */
 #endif /* _ESP_BLE_MESH_MBT_MODEL_API_H_ */
diff --git a/components/bt/esp_ble_mesh/v1.1/btc/include/btc_ble_mesh_mbt_model.h b/components/bt/esp_ble_mesh/v1.1/btc/include/btc_ble_mesh_mbt_model.h
index 4bb82ed1a3..3a90a7739e 100644
--- a/components/bt/esp_ble_mesh/v1.1/btc/include/btc_ble_mesh_mbt_model.h
+++ b/components/bt/esp_ble_mesh/v1.1/btc/include/btc_ble_mesh_mbt_model.h
@@ -19,6 +19,9 @@ extern "C" {
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
+#define BTC_BLE_MESH_MBT_CLIENT_RESULT_COMPLETE     0x00
+#define BTC_BLE_MESH_MBT_CLIENT_RESULT_FAIL         0x01
+
 typedef enum {
     BTC_BLE_MESH_ACT_MBT_CLIENT_RETRIEVE_CAPABILITIES,
     BTC_BLE_MESH_ACT_MBT_CLIENT_TRANSFER_BLOB,
@@ -36,6 +39,49 @@ typedef enum {
     BTC_BLE_MESH_ACT_MBT_CLIENT_MAX,
 } btc_ble_mesh_mbt_client_act_t;
 
+typedef enum {
+    BTC_BLE_MESH_EVT_MBT_CLIENT_RETRIEVE_CAPABILITIES_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_TRANSFER_BLOB_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_SEND_BLOCK_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_SEND_DATA_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_DETERMINE_BLOCK_STATUS_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_DETERMINE_TRANSFER_STATUS_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_CANCEL_TRANSFER_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_SET_TRANSFER_TTL_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_CLEAR_TRANSFER_TTL_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_SET_APP_IDX_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_CLEAR_APP_IDX_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_SET_MULTICAST_ADDR_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_CLEAR_MULTICAST_ADDR_COMP,
+    BTC_BLE_MESH_EVT_MBT_CLIENT_MAX,
+} btc_ble_mesh_mbt_client_evt_t;
+
+typedef enum {
+    BTC_BLE_MESH_ACT_MBT_SERVER_INITIALIZE_BLOB_RECEIVE,
+    BTC_BLE_MESH_ACT_MBT_SERVER_CANCEL_BLOB_RECEIVE,
+    BTC_BLE_MESH_ACT_MBT_SERVER_SET_BLOB_CAPABILITIES,
+    BTC_BLE_MESH_ACT_MBT_SERVER_MAX,
+} btc_ble_mesh_mbt_server_act_t;
+
+typedef enum {
+    BTC_BLE_MESH_EVT_MBT_SERVER_INITIALIZE_BLOB_RECEIVE_COMP,
+    BTC_BLE_MESH_EVT_MBT_SERVER_CANCEL_BLOB_RECEIVE_COMP,
+    BTC_BLE_MESH_EVT_MBT_SERVER_SET_BLOB_CAPABILITIES_COMP,
+    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_TRANSFER_GET,
+    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_TRANSFER_START,
+    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_TRANSFER_CANCEL,
+    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_BLOCK_GET,
+    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_BLOCK_START,
+    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_CHUNK_TRANSFER,
+    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_INFORMATION_GET,
+    BTC_BLE_MESH_EVT_MBT_SERVER_BLOCK_RECEIVE_COMP,
+    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_RECEIVE_COMP,
+    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_RECEIVE_TIMEOUT,
+    BTC_BLE_MESH_EVT_MBT_SERVER_MAX,
+} btc_ble_mesh_mbt_server_evt_t;
+
+#if CONFIG_BLE_MESH_MBT_SRV || CONFIG_BLE_MESH_MBT_CLI
+
 typedef union {
     esp_ble_mesh_retrieve_capabilities_t retrieve_capabilities;
     esp_ble_mesh_transfer_blob_t transfer_blob;
@@ -67,26 +113,6 @@ typedef union {
     } clear_multicast_addr;
 } btc_ble_mesh_mbt_client_args_t;
 
-#define BTC_BLE_MESH_MBT_CLIENT_RESULT_COMPLETE     0x00
-#define BTC_BLE_MESH_MBT_CLIENT_RESULT_FAIL         0x01
-
-typedef enum {
-    BTC_BLE_MESH_EVT_MBT_CLIENT_RETRIEVE_CAPABILITIES_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_TRANSFER_BLOB_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_SEND_BLOCK_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_SEND_DATA_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_DETERMINE_BLOCK_STATUS_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_DETERMINE_TRANSFER_STATUS_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_CANCEL_TRANSFER_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_SET_TRANSFER_TTL_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_CLEAR_TRANSFER_TTL_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_SET_APP_IDX_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_CLEAR_APP_IDX_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_SET_MULTICAST_ADDR_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_CLEAR_MULTICAST_ADDR_COMP,
-    BTC_BLE_MESH_EVT_MBT_CLIENT_MAX,
-} btc_ble_mesh_mbt_client_evt_t;
-
 void btc_ble_mesh_mbt_client_call_handler(btc_msg_t *msg);
 
 void btc_ble_mesh_mbt_client_cb_handler(btc_msg_t *msg);
@@ -103,12 +129,6 @@ void btc_ble_mesh_mbt_client_publish_callback(uint32_t opcode,
 void bt_mesh_mbt_client_cb_evt_to_btc(uint8_t event, uint8_t result,
                                       struct bt_mesh_model *model);
 
-typedef enum {
-    BTC_BLE_MESH_ACT_MBT_SERVER_INITIALIZE_BLOB_RECEIVE,
-    BTC_BLE_MESH_ACT_MBT_SERVER_CANCEL_BLOB_RECEIVE,
-    BTC_BLE_MESH_ACT_MBT_SERVER_SET_BLOB_CAPABILITIES,
-    BTC_BLE_MESH_ACT_MBT_SERVER_MAX,
-} btc_ble_mesh_mbt_server_act_t;
 
 typedef union {
     esp_ble_mesh_initialize_blob_receive_t initialize_blob_receive;
@@ -116,23 +136,6 @@ typedef union {
     esp_ble_mesh_set_blob_capabilities_t set_blob_capabilities;
 } btc_ble_mesh_mbt_server_args_t;
 
-typedef enum {
-    BTC_BLE_MESH_EVT_MBT_SERVER_INITIALIZE_BLOB_RECEIVE_COMP,
-    BTC_BLE_MESH_EVT_MBT_SERVER_CANCEL_BLOB_RECEIVE_COMP,
-    BTC_BLE_MESH_EVT_MBT_SERVER_SET_BLOB_CAPABILITIES_COMP,
-    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_TRANSFER_GET,
-    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_TRANSFER_START,
-    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_TRANSFER_CANCEL,
-    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_BLOCK_GET,
-    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_BLOCK_START,
-    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_CHUNK_TRANSFER,
-    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_INFORMATION_GET,
-    BTC_BLE_MESH_EVT_MBT_SERVER_BLOCK_RECEIVE_COMP,
-    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_RECEIVE_COMP,
-    BTC_BLE_MESH_EVT_MBT_SERVER_BLOB_RECEIVE_TIMEOUT,
-    BTC_BLE_MESH_EVT_MBT_SERVER_MAX,
-} btc_ble_mesh_mbt_server_evt_t;
-
 void btc_ble_mesh_mbt_server_call_handler(btc_msg_t *msg);
 
 void btc_ble_mesh_mbt_server_cb_handler(btc_msg_t *msg);
@@ -141,6 +144,8 @@ void bt_mesh_mbt_server_cb_evt_to_btc(uint8_t event,
                                       struct bt_mesh_model *model,
                                       struct bt_mesh_msg_ctx *ctx);
 
+#endif /* CONFIG_BLE_MESH_MBT_SRV || CONFIG_BLE_MESH_MBT_CLI */
+
 #if CONFIG_IDF_CI_BUILD
 #pragma GCC diagnostic pop
 #endif