diff --git a/component.mk b/component.mk
index 9cecdec3d..16e38458c 100644
--- a/component.mk
+++ b/component.mk
@@ -6,24 +6,53 @@ COMPONENT_SRCDIRS := . \
                   src/draw \
                   src/extra \
                   src/font \
-                  src/gpu \
                   src/hal \
                   src/misc \
                   src/widgets \
+                  src/draw/arm2d \
+                  src/draw/nxp \
+                  src/draw/sdl \
+                  src/draw/stm32_dma2d \
+                  src/draw/sw \
+                  src/draw/swm342_dma2d \
                   src/extra/layouts \
+                  src/extra/libs \
+                  src/extra/others \
+                  src/extra/themes \
+                  src/extra/widgets \
                   src/extra/layouts/flex \
                   src/extra/layouts/grid \
-                  src/extra/themes \
+                  src/extra/libs/bmp \
+                  src/extra/libs/ffmpeg \
+                  src/extra/libs/freetype \
+                  src/extra/libs/fsdrv \
+                  src/extra/libs/gif \
+                  src/extra/libs/png \
+                  src/extra/libs/qrcode \
+                  src/extra/libs/rlottie \
+                  src/extra/libs/sjgp \
+                  src/extra/others/fragment \
+                  src/extra/others/gridnav \
+                  src/extra/others/ime \
+                  src/extra/others/imgfont \
+                  src/extra/others/monkey \
+                  src/extra/others/msg \
+                  src/extra/others/snapshot \
                   src/extra/themes/basic \
                   src/extra/themes/default \
+                  src/extra/themes/mono \
+                  src/extra/widgets/animimg \
                   src/extra/widgets/calendar \
+                  src/extra/widgets/chart \
                   src/extra/widgets/colorwheel \
-                  src/extra/widgets \
                   src/extra/widgets/imgbtn \
                   src/extra/widgets/keyboard \
                   src/extra/widgets/led \
                   src/extra/widgets/list \
+                  src/extra/widgets/menu \
+                  src/extra/widgets/meter \
                   src/extra/widgets/msgbox \
+                  src/extra/widgets/span \
                   src/extra/widgets/spinbox \
                   src/extra/widgets/spinner \
                   src/extra/widgets/tabview \
diff --git a/src/core/lv_core.mk b/src/core/lv_core.mk
index 677a9f6b4..aa8ccfb08 100644
--- a/src/core/lv_core.mk
+++ b/src/core/lv_core.mk
@@ -1,4 +1,5 @@
 CSRCS += lv_disp.c
+CSRCS += lv_event.c
 CSRCS += lv_group.c
 CSRCS += lv_indev.c
 CSRCS += lv_indev_scroll.c
@@ -10,7 +11,6 @@ CSRCS += lv_obj_scroll.c
 CSRCS += lv_obj_style.c
 CSRCS += lv_obj_style_gen.c
 CSRCS += lv_obj_tree.c
-CSRCS += lv_event.c
 CSRCS += lv_refr.c
 CSRCS += lv_theme.c
 
diff --git a/src/draw/lv_draw.mk b/src/draw/lv_draw.mk
index f48f48fe0..34ce244f5 100644
--- a/src/draw/lv_draw.mk
+++ b/src/draw/lv_draw.mk
@@ -1,12 +1,12 @@
-CSRCS += lv_draw_arc.c
 CSRCS += lv_draw.c
+CSRCS += lv_draw_arc.c
 CSRCS += lv_draw_img.c
 CSRCS += lv_draw_label.c
+CSRCS += lv_draw_layer.c
 CSRCS += lv_draw_line.c
 CSRCS += lv_draw_mask.c
 CSRCS += lv_draw_rect.c
 CSRCS += lv_draw_transform.c
-CSRCS += lv_draw_layer.c
 CSRCS += lv_draw_triangle.c
 CSRCS += lv_img_buf.c
 CSRCS += lv_img_cache.c
diff --git a/src/draw/sdl/lv_draw_sdl.mk b/src/draw/sdl/lv_draw_sdl.mk
index c5c28b66b..3bc50fab9 100644
--- a/src/draw/sdl/lv_draw_sdl.mk
+++ b/src/draw/sdl/lv_draw_sdl.mk
@@ -4,6 +4,7 @@ CSRCS += lv_draw_sdl_bg.c
 CSRCS += lv_draw_sdl_composite.c
 CSRCS += lv_draw_sdl_img.c
 CSRCS += lv_draw_sdl_label.c
+CSRCS += lv_draw_sdl_layer.c
 CSRCS += lv_draw_sdl_line.c
 CSRCS += lv_draw_sdl_mask.c
 CSRCS += lv_draw_sdl_polygon.c
@@ -11,7 +12,6 @@ CSRCS += lv_draw_sdl_rect.c
 CSRCS += lv_draw_sdl_stack_blur.c
 CSRCS += lv_draw_sdl_texture_cache.c
 CSRCS += lv_draw_sdl_utils.c
-CSRCS += lv_draw_sdl_layer.c
 
 DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl
 VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl