diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c
index e630ea35b..f182dbaaf 100644
--- a/nimble/host/src/ble_gap.c
+++ b/nimble/host/src/ble_gap.c
@@ -8645,7 +8645,7 @@ ble_gap_notify_rx_event(uint16_t conn_handle, uint16_t attr_handle,
 #if (MYNEWT_VAL(BLE_GATT_NOTIFY) || MYNEWT_VAL(BLE_GATT_INDICATE)) && NIMBLE_BLE_CONNECT
 
     struct ble_gap_event event;
-#if MYNEWT_VAL(BLE_GATT_CACHING)
+#if MYNEWT_VAL(BLE_GATT_CACHING) && MYNEWT_VAL(BLE_GATTC)
     uint16_t start_handle;
     uint16_t end_handle;
 
diff --git a/nimble/host/src/ble_gattc.c b/nimble/host/src/ble_gattc.c
index 8cb013692..d67e8faf1 100644
--- a/nimble/host/src/ble_gattc.c
+++ b/nimble/host/src/ble_gattc.c
@@ -5142,6 +5142,7 @@ done:
     ble_gattc_process_status(proc, rc);
     return rc;
 }
+#endif
 
 /*****************************************************************************
  * $notify                                                                   *
@@ -5159,8 +5160,6 @@ static int ble_gatts_check_conn_aware(uint16_t conn_handle, bool *aware) {
 }
 #endif
 
-#endif
-
 int
 ble_gatts_notify_custom(uint16_t conn_handle, uint16_t chr_val_handle,
                         struct os_mbuf *txom)
diff --git a/nimble/host/src/ble_gattc_cache_conn.c b/nimble/host/src/ble_gattc_cache_conn.c
index 12e70b1ae..542daac9f 100644
--- a/nimble/host/src/ble_gattc_cache_conn.c
+++ b/nimble/host/src/ble_gattc_cache_conn.c
@@ -124,6 +124,7 @@ static struct ble_gattc_cache_conn_chr *
 ble_gattc_cache_conn_chr_find(const struct ble_gattc_cache_conn_svc *svc, uint16_t chr_def_handle,
                               struct ble_gattc_cache_conn_chr **out_prev);
 
+#if MYNEWT_VAL(BLE_GATTC)
 static void
 ble_gattc_cache_conn_disc_chrs(struct ble_gattc_cache_conn *ble_gattc_cache_conn);
 
@@ -132,6 +133,7 @@ ble_gattc_cache_conn_disc_incs(struct ble_gattc_cache_conn *ble_gattc_cache_conn
 
 static void
 ble_gattc_cache_conn_disc_dscs(struct ble_gattc_cache_conn *peer);
+#endif
 
 struct ble_gattc_cache_conn *
 ble_gattc_cache_conn_find(uint16_t conn_handle)
@@ -365,6 +367,7 @@ ble_gattc_cache_conn_chr_delete(struct ble_gattc_cache_conn_chr *chr)
     os_memblock_put(&ble_gattc_cache_conn_chr_pool, chr);
 }
 
+#if MYNEWT_VAL(BLE_GATTC)
 static int
 ble_gattc_cache_conn_db_hash_read(uint16_t conn_handle,
                                   const struct ble_gatt_error *error,
@@ -382,6 +385,7 @@ ble_gattc_cache_conn_db_hash_read(uint16_t conn_handle,
     res = ble_hs_mbuf_to_flat(attr->om, peer->database_hash, sizeof(uint8_t) * 16, NULL);
     return res;
 }
+#endif
 
 const struct ble_gattc_cache_conn_svc *
 ble_gattc_cache_conn_svc_find_uuid(const struct ble_gattc_cache_conn *ble_gattc_cache_conn, const ble_uuid_t *uuid)
@@ -1352,6 +1356,7 @@ void ble_gattc_get_gatt_db(uint16_t conn_handle,
 
 }
 
+#if MYNEWT_VAL(BLE_GATTC)
 static void
 ble_gattc_cache_conn_cache_peer(struct ble_gattc_cache_conn *peer)
 {
@@ -1359,6 +1364,7 @@ ble_gattc_cache_conn_cache_peer(struct ble_gattc_cache_conn *peer)
     size_t db_size = ble_gattc_cache_conn_get_db_size(peer);
     ble_gattc_cache_save(peer, db_size);
 }
+#endif
 
 void
 ble_gattc_cache_conn_broken(uint16_t conn_handle)
@@ -1449,6 +1455,7 @@ ble_gattc_cache_conn_bonding_restored(uint16_t conn_handle)
     }
 }
 
+#if MYNEWT_VAL(BLE_GATTC)
 static void service_sanity_check(struct ble_gattc_cache_conn_svc_list *svcs)
 {
     struct ble_gattc_cache_conn_svc *svc;
@@ -1545,6 +1552,7 @@ ble_gattc_cache_conn_disc_complete(struct ble_gattc_cache_conn *peer, int rc)
         }
     }
 }
+#endif
 
 void
 ble_gattc_cache_conn_undisc_all(ble_addr_t peer_addr)
@@ -1565,6 +1573,8 @@ ble_gattc_cache_conn_undisc_all(ble_addr_t peer_addr)
     }
 }
 
+#if MYNEWT_VAL(BLE_GATTC)
+
 #if MYNEWT_VAL(BLE_GATT_CACHING_INCLUDE_SERVICES)
 static int
 ble_gattc_cache_conn_inc_disced(uint16_t conn_handle, const struct ble_gatt_error *error,
@@ -1604,6 +1614,9 @@ ble_gattc_cache_conn_inc_disced(uint16_t conn_handle, const struct ble_gatt_erro
 
     return rc;
 }
+
+
+
 static int
 ble_gattc_cache_conn_svc_disced(uint16_t conn_handle, const struct ble_gatt_error *error,
                                 const struct ble_gatt_svc *service, void *arg)
@@ -1683,6 +1696,7 @@ ble_gattc_cache_conn_on_read(uint16_t conn_handle,
         return res;
     }
 }
+#endif
 
 int
 ble_gattc_cache_conn_create(uint16_t conn_handle, ble_addr_t ble_gattc_cache_conn_addr)
@@ -1734,6 +1748,7 @@ ble_gattc_cache_conn_load_hash(ble_addr_t peer_addr, uint8_t *hash_key)
     }
 }
 
+#if MYNEWT_VAL(BLE_GATTC)
 static int
 ble_gattc_cache_conn_dsc_disced(uint16_t conn_handle, const struct ble_gatt_error *error,
                                 uint16_t chr_val_handle, const struct ble_gatt_dsc *dsc,
@@ -1917,6 +1932,7 @@ ble_gattc_cache_conn_disc_incs(struct ble_gattc_cache_conn *peer)
     }
     return;
 }
+
 /* As esp_nimble only supports adding/deleting whole services
  * It is safe to assume that the start_handle and end_handle
  * spans 1 or more services
@@ -1944,6 +1960,7 @@ ble_gattc_cache_conn_update(uint16_t conn_handle, uint16_t start_handle, uint16_
         peer->cache_state = CACHE_INVALID;
     }
 }
+#endif
 
 uint16_t
 ble_gattc_cache_conn_get_svc_changed_handle(uint16_t conn_handle)
@@ -2100,6 +2117,7 @@ err:
     return rc;
 }
 
+#if MYNEWT_VAL(BLE_GATTC)
 /**
  * Returns a pointer to a GATT error object with the specified fields.  The
  * returned object is statically allocated, so this function is not reentrant.
@@ -2121,7 +2139,6 @@ ble_gattc_cache_error(int status, uint16_t att_handle)
 }
 
 /* gattc discovery apis */
-
 static int ble_gattc_cache_conn_verify(struct ble_gattc_cache_conn *conn)
 {
     struct ble_hs_conn *gap_conn;
@@ -2574,3 +2591,4 @@ ble_gattc_cache_conn_search_all_dscs(uint16_t conn_handle, uint16_t start_handle
     return 0;
 }
 #endif
+#endif
diff --git a/nimble/host/src/ble_gatts.c b/nimble/host/src/ble_gatts.c
index b9f30fa9b..14cf7408e 100644
--- a/nimble/host/src/ble_gatts.c
+++ b/nimble/host/src/ble_gatts.c
@@ -45,13 +45,14 @@ enum {
     CONN_CLT_CFG_REMOVE = 2,
 };
 #endif
+#endif
 
 #if MYNEWT_VAL(BLE_GATT_CACHING)
 /* store the aware state only for the bonded peers */
 struct ble_gatts_aware_state ble_gatts_conn_aware_states[MYNEWT_VAL(BLE_STORE_MAX_BONDS)];
-/* index of latest bonded peer */
-static int last_conn_aware_state_index;
 #endif
+
+#if MYNEWT_VAL(BLE_GATTS)
 static const ble_uuid_t *uuid_pri =
     BLE_UUID16_DECLARE(BLE_ATT_UUID_PRIMARY_SERVICE);
 static const ble_uuid_t *uuid_sec =
@@ -70,6 +71,11 @@ static const ble_uuid_t *uuid_caf =
 static const struct ble_gatt_svc_def **ble_gatts_svc_defs;
 static int ble_gatts_num_svc_defs;
 
+#if MYNEWT_VAL(BLE_GATT_CACHING)
+/* index of latest bonded peer */
+static int last_conn_aware_state_index;
+#endif
+
 struct ble_gatts_svc_entry {
 #if MYNEWT_VAL(BLE_DYNAMIC_SERVICE)
     STAILQ_ENTRY(ble_gatts_svc_entry) next;