Merge 1a1e5c8196 into dev

lvgl.h

@@ -22,45 +22,45 @@ extern "C" {
  *      INCLUDES
  *********************/
 
-#include "src/lv_misc/lv_log.h"
-#include "src/lv_misc/lv_timer.h"
-#include "src/lv_misc/lv_math.h"
-#include "src/lv_misc/lv_async.h"
+#include "src/misc/lv_log.h"
+#include "src/misc/lv_timer.h"
+#include "src/misc/lv_math.h"
+#include "src/misc/lv_async.h"
 
-#include "src/lv_hal/lv_hal.h"
+#include "src/hal/lv_hal.h"
 
-#include "src/lv_core/lv_obj.h"
-#include "src/lv_core/lv_group.h"
-#include "src/lv_core/lv_indev.h"
+#include "src/core/lv_obj.h"
+#include "src/core/lv_group.h"
+#include "src/core/lv_indev.h"
 
-#include "src/lv_core/lv_refr.h"
-#include "src/lv_core/lv_disp.h"
-#include "src/lv_core/lv_theme.h"
+#include "src/core/lv_refr.h"
+#include "src/core/lv_disp.h"
+#include "src/core/lv_theme.h"
 
-#include "src/lv_font/lv_font.h"
-#include "src/lv_font/lv_font_loader.h"
-#include "src/lv_font/lv_font_fmt_txt.h"
-#include "src/lv_misc/lv_printf.h"
+#include "src/font/lv_font.h"
+#include "src/font/lv_font_loader.h"
+#include "src/font/lv_font_fmt_txt.h"
+#include "src/misc/lv_printf.h"
 
-#include "src/lv_widgets/lv_arc.h"
-#include "src/lv_widgets/lv_btn.h"
-#include "src/lv_widgets/lv_img.h"
-#include "src/lv_widgets/lv_label.h"
-#include "src/lv_widgets/lv_line.h"
-#include "src/lv_widgets/lv_chart.h"
-#include "src/lv_widgets/lv_table.h"
-#include "src/lv_widgets/lv_checkbox.h"
-#include "src/lv_widgets/lv_bar.h"
-#include "src/lv_widgets/lv_slider.h"
-#include "src/lv_widgets/lv_btnmatrix.h"
-#include "src/lv_widgets/lv_dropdown.h"
-#include "src/lv_widgets/lv_roller.h"
-#include "src/lv_widgets/lv_textarea.h"
-#include "src/lv_widgets/lv_canvas.h"
-#include "src/lv_widgets/lv_meter.h"
-#include "src/lv_widgets/lv_switch.h"
+#include "src/widgets/lv_arc.h"
+#include "src/widgets/lv_btn.h"
+#include "src/widgets/lv_img.h"
+#include "src/widgets/lv_label.h"
+#include "src/widgets/lv_line.h"
+#include "src/widgets/lv_chart.h"
+#include "src/widgets/lv_table.h"
+#include "src/widgets/lv_checkbox.h"
+#include "src/widgets/lv_bar.h"
+#include "src/widgets/lv_slider.h"
+#include "src/widgets/lv_btnmatrix.h"
+#include "src/widgets/lv_dropdown.h"
+#include "src/widgets/lv_roller.h"
+#include "src/widgets/lv_textarea.h"
+#include "src/widgets/lv_canvas.h"
+#include "src/widgets/lv_meter.h"
+#include "src/widgets/lv_switch.h"
 
-#include "src/lv_draw/lv_img_cache.h"
+#include "src/draw/lv_img_cache.h"
 
 #include "src/lv_api_map.h"
 

lvgl.mk

@@ -1,9 +1,9 @@
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/examples/examples.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/extra/extra.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_core/lv_core.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw/lv_draw.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font/lv_font.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_gpu/lv_gpu.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_hal/lv_hal.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc/lv_misc.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_widgets/lv_widgets.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_core.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu/lv_gpu.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal/lv_hal.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_misc.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets/lv_widgets.mk

src/core/lv_core.mk

@@ -12,7 +12,7 @@ CSRCS += lv_obj_tree.c
 CSRCS += lv_refr.c
 CSRCS += lv_theme.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_core
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_core
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core
 
-CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_core"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core"

src/core/lv_disp.c

@@ -7,8 +7,8 @@
  *      INCLUDES
  *********************/
 #include "lv_disp.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_core/lv_refr.h"
+#include "../misc/lv_math.h"
+#include "../core/lv_refr.h"
 
 /*********************
  *      DEFINES

src/core/lv_disp.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_hal/lv_hal.h"
+#include "../hal/lv_hal.h"
 #include "lv_obj.h"
 #include "lv_theme.h"
 

src/core/lv_group.c

@@ -9,8 +9,8 @@
 #include <stddef.h>
 
 #include "lv_group.h"
-#include "../lv_misc/lv_gc.h"
-#include "../lv_core/lv_obj.h"
+#include "../misc/lv_gc.h"
+#include "../core/lv_obj.h"
 
 /*********************
  *      DEFINES

src/core/lv_group.h

@@ -18,8 +18,8 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
-#include "../lv_misc/lv_ll.h"
-#include "../lv_misc/lv_types.h"
+#include "../misc/lv_ll.h"
+#include "../misc/lv_types.h"
 
 /*********************
  *      DEFINES

src/core/lv_indev.c

@@ -13,9 +13,9 @@
 #include "lv_group.h"
 #include "lv_refr.h"
 
-#include "../lv_hal/lv_hal_tick.h"
-#include "../lv_misc/lv_timer.h"
-#include "../lv_misc/lv_math.h"
+#include "../hal/lv_hal_tick.h"
+#include "../misc/lv_timer.h"
+#include "../misc/lv_math.h"
 
 /*********************
  *      DEFINES

src/core/lv_indev.h

@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_obj.h"
-#include "../lv_hal/lv_hal_indev.h"
+#include "../hal/lv_hal_indev.h"
 #include "lv_group.h"
 
 /*********************

src/core/lv_obj.c

@@ -12,21 +12,21 @@
 #include "lv_group.h"
 #include "lv_disp.h"
 #include "lv_theme.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_misc/lv_anim.h"
-#include "../lv_misc/lv_timer.h"
-#include "../lv_misc/lv_async.h"
-#include "../lv_misc/lv_fs.h"
-#include "../lv_misc/lv_gc.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_log.h"
-#include "../lv_hal/lv_hal.h"
+#include "../misc/lv_assert.h"
+#include "../draw/lv_draw.h"
+#include "../misc/lv_anim.h"
+#include "../misc/lv_timer.h"
+#include "../misc/lv_async.h"
+#include "../misc/lv_fs.h"
+#include "../misc/lv_gc.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_log.h"
+#include "../hal/lv_hal.h"
 #include <stdint.h>
 #include <string.h>
 
 #if LV_USE_GPU_STM32_DMA2D
-    #include "../lv_gpu/lv_gpu_stm32_dma2d.h"
+    #include "../gpu/gpu_stm32_dma2d.h"
 #endif
 
 /*********************

src/core/lv_obj.h

@@ -17,12 +17,12 @@ extern "C" {
 
 #include <stddef.h>
 #include <stdbool.h>
-#include "../lv_misc/lv_style.h"
-#include "../lv_misc/lv_types.h"
-#include "../lv_misc/lv_area.h"
-#include "../lv_misc/lv_color.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_hal/lv_hal.h"
+#include "../misc/lv_style.h"
+#include "../misc/lv_types.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_assert.h"
+#include "../hal/lv_hal.h"
 
 /*********************
  *      DEFINES

src/core/lv_obj_draw.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_draw/lv_draw.h"
+#include "../draw/lv_draw.h"
 
 /*********************
  *      DEFINES

src/core/lv_obj_pos.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_misc/lv_area.h"
+#include "../misc/lv_area.h"
 
 /*********************
  *      DEFINES

src/core/lv_obj_scroll.h

@@ -13,8 +13,8 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_misc/lv_area.h"
-#include "../lv_misc/lv_anim.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_anim.h"
 
 /*********************
  *      DEFINES

src/core/lv_obj_style.c

@@ -8,7 +8,7 @@
  *********************/
 #include "lv_obj.h"
 #include "lv_disp.h"
-#include "../lv_misc/lv_gc.h"
+#include "../misc/lv_gc.h"
 
 #if defined(LV_GC_INCLUDE)
     #include LV_GC_INCLUDE

src/core/lv_obj_tree.c

@@ -8,9 +8,9 @@
  *********************/
 #include "lv_obj.h"
 #include "lv_indev.h"
-#include "../lv_misc/lv_anim.h"
-#include "../lv_misc/lv_gc.h"
-#include "../lv_misc/lv_async.h"
+#include "../misc/lv_anim.h"
+#include "../misc/lv_gc.h"
+#include "../misc/lv_async.h"
 
 /*********************
  *      DEFINES

src/core/lv_refr.c

@@ -9,18 +9,17 @@
 #include <stddef.h>
 #include "lv_refr.h"
 #include "lv_disp.h"
-#include "../lv_hal/lv_hal_tick.h"
-#include "../lv_hal/lv_hal_disp.h"
-#include "../lv_misc/lv_timer.h"
-#include "../lv_misc/lv_mem.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_gc.h"
-#include "../lv_draw/lv_draw.h"
-#include "../lv_font/lv_font_fmt_txt.h"
-#include "../lv_gpu/lv_gpu_stm32_dma2d.h"
+#include "../hal/lv_hal_tick.h"
+#include "../hal/lv_hal_disp.h"
+#include "../misc/lv_timer.h"
+#include "../misc/lv_mem.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_gc.h"
+#include "../draw/lv_draw.h"
+#include "../font/lv_font_fmt_txt.h"
 
 #if LV_USE_PERF_MONITOR || LV_USE_MEM_MONITOR
-    #include "../lv_widgets/lv_label.h"
+    #include "../widgets/lv_label.h"
 #endif
 
 /*********************

src/core/lv_theme.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *    INCLUDES
  *********************/
-#include "../lv_core/lv_obj.h"
+#include "../core/lv_obj.h"
 
 /*********************
  *    DEFINES

src/draw/lv_draw.h

@@ -15,8 +15,8 @@ extern "C" {
  *********************/
 #include "../lv_conf_internal.h"
 
-#include "../lv_misc/lv_style.h"
-#include "../lv_misc/lv_txt.h"
+#include "../misc/lv_style.h"
+#include "../misc/lv_txt.h"
 #include "lv_img_decoder.h"
 
 #include "lv_draw_rect.h"

src/draw/lv_draw.mk

@@ -10,7 +10,7 @@ CSRCS += lv_img_buf.c
 CSRCS += lv_img_cache.c
 CSRCS += lv_img_decoder.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw
 
-CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_draw"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw"

src/draw/lv_draw_arc.c

@@ -9,9 +9,9 @@
 #include "lv_draw_arc.h"
 #include "lv_draw_rect.h"
 #include "lv_draw_mask.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_log.h"
-#include "../lv_misc/lv_mem.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_log.h"
+#include "../misc/lv_mem.h"
 
 /*********************
  *      DEFINES

src/draw/lv_draw_blend.c

@@ -8,16 +8,16 @@
  *********************/
 #include "lv_draw_blend.h"
 #include "lv_img_decoder.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_hal/lv_hal_disp.h"
-#include "../lv_core/lv_refr.h"
+#include "../misc/lv_math.h"
+#include "../hal/lv_hal_disp.h"
+#include "../core/lv_refr.h"
 
 #if LV_USE_GPU_NXP_PXP
-    #include "../lv_gpu/lv_gpu_nxp_pxp.h"
+    #include "../gpu/gpu_nxp_pxp.h"
 #elif LV_USE_GPU_NXP_VG_LITE
-    #include "../lv_gpu/lv_gpu_nxp_vglite.h"
+    #include "../gpu/gpu_nxp_vglite.h"
 #elif LV_USE_GPU_STM32_DMA2D
-    #include "../lv_gpu/lv_gpu_stm32_dma2d.h"
+    #include "../gpu/gpu_stm32_dma2d.h"
 #endif
 
 /*********************

src/draw/lv_draw_blend.h

@@ -13,9 +13,9 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_misc/lv_color.h"
-#include "../lv_misc/lv_area.h"
-#include "../lv_misc/lv_style.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_style.h"
 #include "lv_draw_mask.h"
 
 /*********************

src/draw/lv_draw_img.c

@@ -8,15 +8,15 @@
  *********************/
 #include "lv_draw_img.h"
 #include "lv_img_cache.h"
-#include "../lv_hal/lv_hal_disp.h"
-#include "../lv_misc/lv_log.h"
-#include "../lv_core/lv_refr.h"
-#include "../lv_misc/lv_mem.h"
-#include "../lv_misc/lv_math.h"
+#include "../hal/lv_hal_disp.h"
+#include "../misc/lv_log.h"
+#include "../core/lv_refr.h"
+#include "../misc/lv_mem.h"
+#include "../misc/lv_math.h"
 #if LV_USE_GPU_STM32_DMA2D
-    #include "../lv_gpu/lv_gpu_stm32_dma2d.h"
+    #include "../gpu/gpu_stm32_dma2d.h"
 #elif LV_USE_GPU_NXP_PXP
-    #include "../lv_gpu/lv_gpu_nxp_pxp.h"
+    #include "../gpu/gpu_nxp_pxp.h"
 #endif
 
 /*********************

src/draw/lv_draw_label.c

@@ -7,11 +7,11 @@
  *      INCLUDES
  *********************/
 #include "lv_draw_label.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_hal/lv_hal_disp.h"
-#include "../lv_core/lv_refr.h"
-#include "../lv_misc/lv_bidi.h"
-#include "../lv_misc/lv_assert.h"
+#include "../misc/lv_math.h"
+#include "../hal/lv_hal_disp.h"
+#include "../core/lv_refr.h"
+#include "../misc/lv_bidi.h"
+#include "../misc/lv_assert.h"
 
 /*********************
  *      DEFINES

src/draw/lv_draw_label.h

@@ -14,9 +14,9 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_draw_blend.h"
-#include "../lv_misc/lv_bidi.h"
-#include "../lv_misc/lv_txt.h"
-#include "../lv_misc/lv_color.h"
+#include "../misc/lv_bidi.h"
+#include "../misc/lv_txt.h"
+#include "../misc/lv_color.h"
 
 /*********************
  *      DEFINES

src/draw/lv_draw_line.c

@@ -10,8 +10,8 @@
 #include <stdbool.h>
 #include "lv_draw_mask.h"
 #include "lv_draw_blend.h"
-#include "../lv_core/lv_refr.h"
-#include "../lv_misc/lv_math.h"
+#include "../core/lv_refr.h"
+#include "../misc/lv_math.h"
 
 /*********************
  *      DEFINES

src/draw/lv_draw_mask.c

@@ -10,10 +10,10 @@
 
 #include "lv_draw_mask.h"
 #if LV_DRAW_COMPLEX
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_log.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_misc/lv_gc.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_log.h"
+#include "../misc/lv_assert.h"
+#include "../misc/lv_gc.h"
 
 /*********************
  *      DEFINES

src/draw/lv_draw_mask.h

@@ -15,9 +15,9 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include <stdbool.h>
-#include "../lv_misc/lv_area.h"
-#include "../lv_misc/lv_color.h"
-#include "../lv_misc/lv_math.h"
+#include "../misc/lv_area.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_math.h"
 
 /*********************
  *      DEFINES

src/draw/lv_draw_rect.c

@@ -9,10 +9,10 @@
 #include "lv_draw_rect.h"
 #include "lv_draw_blend.h"
 #include "lv_draw_mask.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_txt_ap.h"
-#include "../lv_core/lv_refr.h"
-#include "../lv_misc/lv_assert.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_txt_ap.h"
+#include "../core/lv_refr.h"
+#include "../misc/lv_assert.h"
 
 /*********************
  *      DEFINES

src/draw/lv_draw_rect.h

@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_draw_blend.h"
-#include "../lv_font/lv_font.h"
+#include "../font/lv_font.h"
 
 /*********************
  *      DEFINES

src/draw/lv_draw_triangle.c

@@ -7,8 +7,8 @@
  *      INCLUDES
  *********************/
 #include "lv_draw_triangle.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_mem.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_mem.h"
 
 /*********************
  *      DEFINES

src/draw/lv_img_buf.c

@@ -10,9 +10,9 @@
 #include <string.h>
 #include "lv_img_buf.h"
 #include "lv_draw_img.h"
-#include "../lv_misc/lv_math.h"
-#include "../lv_misc/lv_log.h"
-#include "../lv_misc/lv_mem.h"
+#include "../misc/lv_math.h"
+#include "../misc/lv_log.h"
+#include "../misc/lv_mem.h"
 
 /*********************
  *      DEFINES

src/draw/lv_img_buf.h

@@ -14,8 +14,8 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include <stdbool.h>
-#include "../lv_misc/lv_color.h"
-#include "../lv_misc/lv_area.h"
+#include "../misc/lv_color.h"
+#include "../misc/lv_area.h"
 
 /*********************
  *      DEFINES

src/draw/lv_img_cache.c

@@ -6,12 +6,12 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../lv_misc/lv_assert.h"
+#include "../misc/lv_assert.h"
 #include "lv_img_cache.h"
 #include "lv_img_decoder.h"
 #include "lv_draw_img.h"
-#include "../lv_hal/lv_hal_tick.h"
-#include "../lv_misc/lv_gc.h"
+#include "../hal/lv_hal_tick.h"
+#include "../misc/lv_gc.h"
 
 /*********************
  *      DEFINES

src/draw/lv_img_decoder.c

@@ -7,10 +7,10 @@
  *      INCLUDES
  *********************/
 #include "lv_img_decoder.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_draw/lv_draw_img.h"
-#include "../lv_misc/lv_ll.h"
-#include "../lv_misc/lv_gc.h"
+#include "../misc/lv_assert.h"
+#include "../draw/lv_draw_img.h"
+#include "../misc/lv_ll.h"
+#include "../misc/lv_gc.h"
 
 /*********************
  *      DEFINES

src/draw/lv_img_decoder.h

@@ -17,9 +17,9 @@ extern "C" {
 
 #include <stdint.h>
 #include "lv_img_buf.h"
-#include "../lv_misc/lv_fs.h"
-#include "../lv_misc/lv_types.h"
-#include "../lv_misc/lv_area.h"
+#include "../misc/lv_fs.h"
+#include "../misc/lv_types.h"
+#include "../misc/lv_area.h"
 
 /*********************
  *      DEFINES

src/extra/layouts/flex/lv_flex.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 #if LV_USE_FLEX
 
 /*********************

src/extra/layouts/grid/lv_grid.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 
 /*********************
  *      DEFINES

src/extra/themes/default/lv_theme_default.c

@@ -11,7 +11,7 @@
 #if LV_USE_THEME_DEFAULT
 
 #include "lv_theme_default.h"
-#include "../../../lv_misc/lv_gc.h"
+#include "../../../misc/lv_gc.h"
 
 #if defined(LV_GC_INCLUDE)
 #include LV_GC_INCLUDE

src/extra/themes/default/lv_theme_default.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 
 #if LV_USE_THEME_DEFAULT
 

src/extra/widgets/calendar/lv_calendar.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_widgets/lv_btnmatrix.h"
+#include "../../../widgets/lv_btnmatrix.h"
 
 #if LV_USE_CALENDAR
 

src/extra/widgets/calendar/lv_calendar_header_arrow.c

@@ -10,8 +10,8 @@
 #if LV_USE_CALENDAR_HEADER_ARROW
 
 #include "lv_calendar.h"
-#include "../../../lv_widgets/lv_btn.h"
-#include "../../../lv_widgets/lv_label.h"
+#include "../../../widgets/lv_btn.h"
+#include "../../../widgets/lv_label.h"
 #include "../../layouts/flex/lv_flex.h"
 
 /*********************

src/extra/widgets/calendar/lv_calendar_header_arrow.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 #if LV_USE_CALENDAR_HEADER_ARROW
 
 /*********************

src/extra/widgets/calendar/lv_calendar_header_dropdown.c

@@ -10,7 +10,7 @@
 #if LV_USE_CALENDAR_HEADER_DROPDOWN
 
 #include "lv_calendar.h"
-#include "../../../lv_widgets/lv_dropdown.h"
+#include "../../../widgets/lv_dropdown.h"
 #include "../../layouts/flex/lv_flex.h"
 
 /*********************

src/extra/widgets/calendar/lv_calendar_header_dropdown.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 #if LV_USE_CALENDAR_HEADER_DROPDOWN
 
 /*********************

src/extra/widgets/keyboard/lv_keyboard.c

@@ -10,7 +10,7 @@
 #include "lv_keyboard.h"
 #if LV_USE_KEYBOARD
 
-#include "../../../lv_widgets/lv_textarea.h"
+#include "../../../widgets/lv_textarea.h"
 
 /*********************
  *      DEFINES

src/extra/widgets/keyboard/lv_keyboard.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_widgets/lv_btnmatrix.h"
+#include "../../../widgets/lv_btnmatrix.h"
 
 #if LV_USE_KEYBOARD
 

src/extra/widgets/list/lv_list.c

@@ -7,10 +7,10 @@
  *      INCLUDES
  *********************/
 #include "lv_list.h"
-#include "../../../lv_core/lv_disp.h"
-#include "../../../lv_widgets/lv_label.h"
-#include "../../../lv_widgets/lv_img.h"
-#include "../../../lv_widgets/lv_btn.h"
+#include "../../../core/lv_disp.h"
+#include "../../../widgets/lv_label.h"
+#include "../../../widgets/lv_img.h"
+#include "../../../widgets/lv_btn.h"
 
 #if LV_USE_LIST
 

src/extra/widgets/list/lv_list.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 #include "../../layouts/flex/lv_flex.h"
 
 #if LV_USE_LIST

src/extra/widgets/tileview/lv_tileview.h

@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "../../../lv_core/lv_obj.h"
+#include "../../../core/lv_obj.h"
 
 #if LV_USE_TILEVIEW
 

src/font/lv_font.c

@@ -8,8 +8,8 @@
  *********************/
 
 #include "lv_font.h"
-#include "../lv_misc/lv_utils.h"
-#include "../lv_misc/lv_log.h"
+#include "../misc/lv_utils.h"
+#include "../misc/lv_log.h"
 
 /*********************
  *      DEFINES

src/font/lv_font.h

@@ -19,7 +19,7 @@ extern "C" {
 #include <stdbool.h>
 
 #include "lv_symbol_def.h"
-#include "../lv_misc/lv_area.h"
+#include "../misc/lv_area.h"
 
 /*********************
  *      DEFINES

src/font/lv_font.mk

@@ -30,7 +30,7 @@ CSRCS += lv_font_simsun_16_cjk.c
 CSRCS += lv_font_unscii_8.c
 CSRCS += lv_font_unscii_16.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font
 
-CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_font"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font"

src/font/lv_font_fmt_txt.c

@@ -8,12 +8,12 @@
  *********************/
 #include "lv_font.h"
 #include "lv_font_fmt_txt.h"
-#include "../lv_misc/lv_assert.h"
-#include "../lv_misc/lv_types.h"
-#include "../lv_misc/lv_gc.h"
-#include "../lv_misc/lv_log.h"
-#include "../lv_misc/lv_utils.h"
-#include "../lv_misc/lv_mem.h"
+#include "../misc/lv_assert.h"
+#include "../misc/lv_types.h"
+#include "../misc/lv_gc.h"
+#include "../misc/lv_log.h"
+#include "../misc/lv_utils.h"
+#include "../misc/lv_mem.h"
 
 /*********************
  *      DEFINES

src/font/lv_font_loader.c

@@ -11,7 +11,7 @@
 #include <stdbool.h>
 
 #include "../lvgl.h"
-#include "../lv_misc/lv_fs.h"
+#include "../misc/lv_fs.h"
 #include "lv_font_loader.h"
 
 /**********************