diff --git a/lvgl.mk b/lvgl.mk
index 766ca3af1d..664987aa76 100644
--- a/lvgl.mk
+++ b/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
diff --git a/src/core/lv_core.mk b/src/core/lv_core.mk
index 1116c1463c..9d5e075eb2 100644
--- a/src/core/lv_core.mk
+++ b/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"
diff --git a/src/draw/lv_draw.mk b/src/draw/lv_draw.mk
index ad2f8ef396..a31fedf43e 100644
--- a/src/draw/lv_draw.mk
+++ b/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"
diff --git a/src/font/lv_font.mk b/src/font/lv_font.mk
index f4bb75d56a..2201b73f22 100644
--- a/src/font/lv_font.mk
+++ b/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"
diff --git a/src/gpu/lv_gpu.mk b/src/gpu/lv_gpu.mk
index c647d558d7..d909b03350 100644
--- a/src/gpu/lv_gpu.mk
+++ b/src/gpu/lv_gpu.mk
@@ -3,7 +3,7 @@ CSRCS += lv_gpu_nxp_pxp_osa.c
 CSRCS += lv_gpu_nxp_vglite.c
 CSRCS += lv_gpu_stm32_dma2d.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_gpu
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_gpu
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu
 
-CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_gpu"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu"
diff --git a/src/hal/lv_hal.mk b/src/hal/lv_hal.mk
index 80620cf629..c35ec2d7a5 100644
--- a/src/hal/lv_hal.mk
+++ b/src/hal/lv_hal.mk
@@ -2,7 +2,7 @@ CSRCS += lv_hal_disp.c
 CSRCS += lv_hal_indev.c
 CSRCS += lv_hal_tick.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_hal
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_hal
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal
 
-CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_hal"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal"
diff --git a/src/misc/lv_misc.mk b/src/misc/lv_misc.mk
index 0501212c3c..d959cc857a 100644
--- a/src/misc/lv_misc.mk
+++ b/src/misc/lv_misc.mk
@@ -17,7 +17,7 @@ CSRCS += lv_txt.c
 CSRCS += lv_txt_ap.c
 CSRCS += lv_utils.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc
 
-CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_misc"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc"
diff --git a/src/widgets/lv_widgets.mk b/src/widgets/lv_widgets.mk
index 00b2727e16..2ce351461b 100644
--- a/src/widgets/lv_widgets.mk
+++ b/src/widgets/lv_widgets.mk
@@ -16,7 +16,7 @@ CSRCS += lv_switch.c
 CSRCS += lv_table.c
 CSRCS += lv_textarea.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_widgets
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_widgets
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets
 
-CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/lv_widgets"
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/widgets"