diff --git a/src/draw/arm2d/lv_draw_arm2d.mk b/src/draw/arm2d/lv_draw_arm2d.mk
new file mode 100644
index 000000000..17219b07e
--- /dev/null
+++ b/src/draw/arm2d/lv_draw_arm2d.mk
@@ -0,0 +1,6 @@
+CSRCS += lv_gpu_arm2d.c
+
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/arm2d
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/arm2d
+
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/arm2d"
diff --git a/src/draw/lv_draw.mk b/src/draw/lv_draw.mk
index 3394a8985..3409a5ea4 100644
--- a/src/draw/lv_draw.mk
+++ b/src/draw/lv_draw.mk
@@ -15,5 +15,9 @@ VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw
 
 CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw"
 
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/arm2d/lv_draw_arm2d.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp_pxp/lv_draw_nxp_pxp.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp_vglite/lv_draw_nxp_vglite.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl/lv_draw_sdl.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/stm32_dma2d/lv_draw_stm32_dma2d.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw.mk
diff --git a/src/draw/nxp_pxp/lv_draw_nxp_pxp.mk b/src/draw/nxp_pxp/lv_draw_nxp_pxp.mk
new file mode 100644
index 000000000..446e852d8
--- /dev/null
+++ b/src/draw/nxp_pxp/lv_draw_nxp_pxp.mk
@@ -0,0 +1,7 @@
+CSRCS += lv_gpu_nxp_pxp.c
+CSRCS += lv_gpu_nxp_pxp_osa.c
+
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp_pxp
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp_pxp
+
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp_pxp"
diff --git a/src/draw/nxp_vglite/lv_draw_nxp_vglite.mk b/src/draw/nxp_vglite/lv_draw_nxp_vglite.mk
new file mode 100644
index 000000000..95ee9a51c
--- /dev/null
+++ b/src/draw/nxp_vglite/lv_draw_nxp_vglite.mk
@@ -0,0 +1,6 @@
+CSRCS += lv_gpu_nxp_vglite.c
+
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp_vglite
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp_vglite
+
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/nxp_vglite"
diff --git a/src/draw/stm32_dma2d/lv_draw_stm32_dma2d.mk b/src/draw/stm32_dma2d/lv_draw_stm32_dma2d.mk
new file mode 100644
index 000000000..8ed00b015
--- /dev/null
+++ b/src/draw/stm32_dma2d/lv_draw_stm32_dma2d.mk
@@ -0,0 +1,6 @@
+CSRCS += lv_gpu_stm32_dma2d.c
+
+DEPPATH += --dep-path $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/stm32_dma2d
+VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/stm32_dma2d
+
+CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/stm32_dma2d"
diff --git a/src/gpu/lv_gpu.mk b/src/gpu/lv_gpu.mk
deleted file mode 100644
index f810e0c70..000000000
--- a/src/gpu/lv_gpu.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-CSRCS += lv_gpu_nxp_pxp.c
-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/gpu
-VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu
-
-CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/gpu"
-