diff --git a/src/lv_api_map.h b/src/lv_api_map.h
index bd8db2fc0..7a6271a48 100644
--- a/src/lv_api_map.h
+++ b/src/lv_api_map.h
@@ -30,21 +30,30 @@ extern "C" {
 /*---------------------
  * V6.0 COMPATIBILITY
  *--------------------*/
+
+#if LV_USE_CHART
+
 #define lv_chart_get_point_cnt lv_chart_get_point_count
 
+#endif
+
+
+#if LV_USE_DDLIST
+
 static inline void lv_ddlist_set_draw_arrow(lv_obj_t * ddlist, bool en)
 {
     if(en) lv_ddlist_set_symbol(ddlist, LV_SYMBOL_DOWN);
     else lv_ddlist_set_symbol(ddlist, NULL);
 }
 
-
 static inline bool lv_ddlist_get_draw_arrow(lv_obj_t * ddlist)
 {
     if(lv_ddlist_get_symbol(ddlist)) return true;
     else return false;
 }
 
+#endif
+
 /**********************
  *      MACROS
  **********************/
diff --git a/src/lv_draw/lv_img_decoder.c b/src/lv_draw/lv_img_decoder.c
index f14c0b6f2..f41f12c2e 100644
--- a/src/lv_draw/lv_img_decoder.c
+++ b/src/lv_draw/lv_img_decoder.c
@@ -623,7 +623,7 @@ static lv_res_t lv_img_decoder_built_in_line_alpha(lv_img_decoder_dsc_t * dsc, l
 
 #if LV_USE_FILESYSTEM
     lv_img_decoder_built_in_data_t * user_data = dsc->user_data;
-    uint8_t * fs_buf = lv_draw_buf_get(w);
+    uint8_t * fs_buf = lv_mem_buf_get(w);
 #endif
 
     const uint8_t * data_tmp = NULL;
@@ -658,7 +658,7 @@ static lv_res_t lv_img_decoder_built_in_line_alpha(lv_img_decoder_dsc_t * dsc, l
         }
     }
 #if LV_USE_FILESYSTEM
-    lv_draw_buf_release(fs_buf);
+    lv_mem_buf_release(fs_buf);
 #endif
     return LV_RES_OK;
 
@@ -712,7 +712,7 @@ static lv_res_t lv_img_decoder_built_in_line_indexed(lv_img_decoder_dsc_t * dsc,
     lv_img_decoder_built_in_data_t * user_data = dsc->user_data;
 
 #if LV_USE_FILESYSTEM
-    uint8_t * fs_buf = lv_draw_buf_get(w);
+    uint8_t * fs_buf = lv_mem_buf_get(w);
 #endif
     const uint8_t * data_tmp = NULL;
     if(dsc->src_type == LV_IMG_SRC_VARIABLE) {
@@ -756,7 +756,7 @@ static lv_res_t lv_img_decoder_built_in_line_indexed(lv_img_decoder_dsc_t * dsc,
         }
     }
 #if LV_USE_FILESYSTEM
-    lv_draw_buf_release(fs_buf);
+    lv_mem_buf_release(fs_buf);
 #endif
     return LV_RES_OK;
 #else