diff --git a/src/draw/vg_lite/lv_draw_vg_lite.c b/src/draw/vg_lite/lv_draw_vg_lite.c
index 23c2f46a86..e02391e6f2 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite.c
+++ b/src/draw/vg_lite/lv_draw_vg_lite.c
@@ -11,7 +11,6 @@
 
 #if LV_USE_DRAW_VG_LITE
 
-#include "../lv_draw_private.h"
 #include "lv_draw_vg_lite_type.h"
 #include "lv_vg_lite_path.h"
 #include "lv_vg_lite_utils.h"
diff --git a/src/draw/vg_lite/lv_draw_vg_lite.h b/src/draw/vg_lite/lv_draw_vg_lite.h
index 07a9abceba..135f003d2e 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite.h
+++ b/src/draw/vg_lite/lv_draw_vg_lite.h
@@ -16,7 +16,7 @@ extern "C" {
 #include "../../lv_conf_internal.h"
 
 #if LV_USE_DRAW_VG_LITE
-#include "../lv_draw.h"
+
 #include "../../draw/lv_draw_vector.h"
 #include "../../draw/lv_draw_arc.h"
 #include "../../draw/lv_draw_rect.h"
diff --git a/src/draw/vg_lite/lv_draw_vg_lite_arc.c b/src/draw/vg_lite/lv_draw_vg_lite_arc.c
index 6bba17abe8..5c65e0cae3 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite_arc.c
+++ b/src/draw/vg_lite/lv_draw_vg_lite_arc.c
@@ -7,9 +7,6 @@
  *      INCLUDES
  *********************/
 
-#include "../../misc/lv_area_private.h"
-#include "../lv_image_decoder_private.h"
-#include "../lv_draw_private.h"
 #include "lv_draw_vg_lite.h"
 
 #if LV_USE_DRAW_VG_LITE
@@ -19,7 +16,8 @@
 #include "lv_vg_lite_path.h"
 #include "lv_vg_lite_pending.h"
 #include "lv_vg_lite_utils.h"
-#include <math.h>
+#include "../../misc/lv_area_private.h"
+#include "../lv_image_decoder_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/vg_lite/lv_draw_vg_lite_border.c b/src/draw/vg_lite/lv_draw_vg_lite_border.c
index a769d73b28..b880360f71 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite_border.c
+++ b/src/draw/vg_lite/lv_draw_vg_lite_border.c
@@ -7,8 +7,6 @@
  *      INCLUDES
  *********************/
 
-#include "../../misc/lv_area_private.h"
-#include "../lv_draw_private.h"
 #include "lv_draw_vg_lite.h"
 
 #if LV_USE_DRAW_VG_LITE
@@ -17,6 +15,7 @@
 #include "lv_vg_lite_utils.h"
 #include "lv_vg_lite_path.h"
 #include "lv_vg_lite_math.h"
+#include "../../misc/lv_area_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/vg_lite/lv_draw_vg_lite_box_shadow.c b/src/draw/vg_lite/lv_draw_vg_lite_box_shadow.c
index 5434871382..1ef0a53707 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite_box_shadow.c
+++ b/src/draw/vg_lite/lv_draw_vg_lite_box_shadow.c
@@ -7,12 +7,12 @@
  *      INCLUDES
  *********************/
 
-#include "../../misc/lv_area_private.h"
 #include "lv_draw_vg_lite.h"
 
 #if LV_USE_DRAW_VG_LITE
 
 #include "lv_draw_vg_lite_type.h"
+#include "../../misc/lv_area_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/vg_lite/lv_draw_vg_lite_fill.c b/src/draw/vg_lite/lv_draw_vg_lite_fill.c
index 37cb372e8d..302ae9ddc3 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite_fill.c
+++ b/src/draw/vg_lite/lv_draw_vg_lite_fill.c
@@ -7,7 +7,6 @@
  *      INCLUDES
  *********************/
 
-#include "../../misc/lv_area_private.h"
 #include "lv_draw_vg_lite.h"
 
 #if LV_USE_DRAW_VG_LITE
@@ -16,6 +15,7 @@
 #include "lv_vg_lite_path.h"
 #include "lv_vg_lite_utils.h"
 #include "lv_vg_lite_grad.h"
+#include "../../misc/lv_area_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/vg_lite/lv_draw_vg_lite_img.c b/src/draw/vg_lite/lv_draw_vg_lite_img.c
index e26ab67085..0e064e2aef 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite_img.c
+++ b/src/draw/vg_lite/lv_draw_vg_lite_img.c
@@ -7,10 +7,6 @@
  *      INCLUDES
  *********************/
 
-#include "../../misc/lv_area_private.h"
-#include "../lv_image_decoder_private.h"
-#include "../lv_draw_image_private.h"
-#include "../lv_draw_private.h"
 #include "lv_draw_vg_lite.h"
 
 #if LV_USE_DRAW_VG_LITE
@@ -20,6 +16,8 @@
 #include "lv_vg_lite_path.h"
 #include "lv_vg_lite_pending.h"
 #include "lv_vg_lite_utils.h"
+#include "../../misc/lv_area_private.h"
+#include "../lv_image_decoder_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/vg_lite/lv_draw_vg_lite_label.c b/src/draw/vg_lite/lv_draw_vg_lite_label.c
index 2b24849421..fb9f5ea6f9 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite_label.c
+++ b/src/draw/vg_lite/lv_draw_vg_lite_label.c
@@ -7,11 +7,10 @@
  *      INCLUDES
  *********************/
 
-#include "../../lvgl.h"
+#include "lv_draw_vg_lite.h"
 
 #if LV_USE_DRAW_VG_LITE
 
-#include "lv_draw_vg_lite.h"
 #include "lv_draw_vg_lite_type.h"
 #include "lv_vg_lite_utils.h"
 #include "lv_vg_lite_path.h"
@@ -23,7 +22,6 @@
 #include "../lv_draw_label_private.h"
 #include "../lv_draw_image_private.h"
 
-
 /*********************
  *      DEFINES
  *********************/
diff --git a/src/draw/vg_lite/lv_draw_vg_lite_layer.c b/src/draw/vg_lite/lv_draw_vg_lite_layer.c
index 7aa3c6c438..c184d424bd 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite_layer.c
+++ b/src/draw/vg_lite/lv_draw_vg_lite_layer.c
@@ -13,7 +13,6 @@
 
 #include "lv_draw_vg_lite_type.h"
 #include "lv_vg_lite_utils.h"
-#include "lv_vg_lite_path.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/vg_lite/lv_draw_vg_lite_line.c b/src/draw/vg_lite/lv_draw_vg_lite_line.c
index 5964bc13d3..fb7cec73f7 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite_line.c
+++ b/src/draw/vg_lite/lv_draw_vg_lite_line.c
@@ -7,7 +7,6 @@
  *      INCLUDES
  *********************/
 
-#include "../../misc/lv_area_private.h"
 #include "lv_draw_vg_lite.h"
 
 #if LV_USE_DRAW_VG_LITE
@@ -16,6 +15,7 @@
 #include "lv_vg_lite_math.h"
 #include "lv_vg_lite_path.h"
 #include "lv_vg_lite_utils.h"
+#include "../../misc/lv_area_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/vg_lite/lv_draw_vg_lite_mask_rect.c b/src/draw/vg_lite/lv_draw_vg_lite_mask_rect.c
index 934d116dab..d644f97d7e 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite_mask_rect.c
+++ b/src/draw/vg_lite/lv_draw_vg_lite_mask_rect.c
@@ -7,9 +7,6 @@
  *      INCLUDES
  *********************/
 
-#include "../../misc/lv_area_private.h"
-#include "../sw/lv_draw_sw_mask_private.h"
-#include "../lv_draw_mask_private.h"
 #include "lv_draw_vg_lite.h"
 
 #if LV_USE_DRAW_VG_LITE
@@ -17,6 +14,9 @@
 #include "lv_vg_lite_utils.h"
 #include "lv_draw_vg_lite_type.h"
 #include "lv_vg_lite_path.h"
+#include "../../misc/lv_area_private.h"
+#include "../sw/lv_draw_sw_mask_private.h"
+#include "../lv_draw_mask_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/vg_lite/lv_draw_vg_lite_triangle.c b/src/draw/vg_lite/lv_draw_vg_lite_triangle.c
index 75bc0f4d7c..d25447716a 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite_triangle.c
+++ b/src/draw/vg_lite/lv_draw_vg_lite_triangle.c
@@ -7,15 +7,15 @@
  *      INCLUDES
  *********************/
 
-#include "../../misc/lv_area_private.h"
 #include "lv_draw_vg_lite.h"
 
 #if LV_USE_DRAW_VG_LITE
 
+#include "lv_draw_vg_lite_type.h"
 #include "lv_vg_lite_utils.h"
 #include "lv_vg_lite_path.h"
-#include "lv_draw_vg_lite_type.h"
 #include "lv_vg_lite_grad.h"
+#include "../../misc/lv_area_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/vg_lite/lv_draw_vg_lite_type.h b/src/draw/vg_lite/lv_draw_vg_lite_type.h
index 1dd11790bf..bb3ef9663a 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite_type.h
+++ b/src/draw/vg_lite/lv_draw_vg_lite_type.h
@@ -42,7 +42,7 @@ extern "C" {
 struct _lv_vg_lite_pending_t;
 struct _lv_vg_lite_grad_ctx_t;
 
-struct _lv_draw_vg_lite_unit_t {
+typedef struct _lv_draw_vg_lite_unit_t {
     lv_draw_unit_t base_unit;
     lv_draw_task_t * task_act;
     lv_area_t current_scissor_area;
@@ -63,7 +63,7 @@ struct _lv_draw_vg_lite_unit_t {
     vg_lite_matrix_t global_matrix;
     struct _lv_vg_lite_path_t * global_path;
     bool path_in_use;
-};
+} lv_draw_vg_lite_unit_t;
 
 /**********************
  * GLOBAL PROTOTYPES
diff --git a/src/draw/vg_lite/lv_vg_lite_decoder.c b/src/draw/vg_lite/lv_vg_lite_decoder.c
index fd3af44e23..8da7639146 100644
--- a/src/draw/vg_lite/lv_vg_lite_decoder.c
+++ b/src/draw/vg_lite/lv_vg_lite_decoder.c
@@ -7,15 +7,14 @@
  *      INCLUDES
  *********************/
 
-#include "../lv_image_decoder_private.h"
 #include "lv_vg_lite_decoder.h"
 
 #if LV_USE_DRAW_VG_LITE
 
 #include "lv_vg_lite_utils.h"
-#include <stdlib.h>
-#include <string.h>
 #include "../../core/lv_global.h"
+#include "../lv_image_decoder_private.h"
+#include "../../libs/bin_decoder/lv_bin_decoder.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/vg_lite/lv_vg_lite_decoder.h b/src/draw/vg_lite/lv_vg_lite_decoder.h
index 9bab540c6e..36ba2152df 100644
--- a/src/draw/vg_lite/lv_vg_lite_decoder.h
+++ b/src/draw/vg_lite/lv_vg_lite_decoder.h
@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 
-#include "../lv_image_decoder.h"
+#include "../../lv_conf_internal.h"
 
 #if LV_USE_DRAW_VG_LITE
 
diff --git a/src/draw/vg_lite/lv_vg_lite_grad.c b/src/draw/vg_lite/lv_vg_lite_grad.c
index e117aecb33..e0aa303d1f 100644
--- a/src/draw/vg_lite/lv_vg_lite_grad.c
+++ b/src/draw/vg_lite/lv_vg_lite_grad.c
@@ -7,7 +7,6 @@
  *      INCLUDES
  *********************/
 
-#include "../lv_draw_vector_private.h"
 #include "lv_vg_lite_grad.h"
 
 #if LV_USE_DRAW_VG_LITE && LV_USE_VECTOR_GRAPHIC
@@ -15,8 +14,7 @@
 #include "lv_draw_vg_lite_type.h"
 #include "lv_vg_lite_pending.h"
 #include "lv_vg_lite_math.h"
-#include "../../misc/lv_types.h"
-#include "../../stdlib/lv_string.h"
+#include "../lv_draw_vector_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/vg_lite/lv_vg_lite_grad.h b/src/draw/vg_lite/lv_vg_lite_grad.h
index 4195701f0d..c82b9ee92a 100644
--- a/src/draw/vg_lite/lv_vg_lite_grad.h
+++ b/src/draw/vg_lite/lv_vg_lite_grad.h
@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 
-#include "../../lvgl.h"
+#include "../../lv_conf_internal.h"
 
 #if LV_USE_DRAW_VG_LITE && LV_USE_VECTOR_GRAPHIC
 
diff --git a/src/draw/vg_lite/lv_vg_lite_path.c b/src/draw/vg_lite/lv_vg_lite_path.c
index ea49cf86dd..85f8a5886f 100644
--- a/src/draw/vg_lite/lv_vg_lite_path.c
+++ b/src/draw/vg_lite/lv_vg_lite_path.c
@@ -13,7 +13,6 @@
 
 #include "lv_draw_vg_lite_type.h"
 #include "lv_vg_lite_math.h"
-#include <float.h>
 
 /*********************
  *      DEFINES
diff --git a/src/draw/vg_lite/lv_vg_lite_path.h b/src/draw/vg_lite/lv_vg_lite_path.h
index 09ac1d2780..101b3d1a43 100644
--- a/src/draw/vg_lite/lv_vg_lite_path.h
+++ b/src/draw/vg_lite/lv_vg_lite_path.h
@@ -17,7 +17,6 @@ extern "C" {
 #include "lv_vg_lite_utils.h"
 
 #if LV_USE_DRAW_VG_LITE
-#include <float.h>
 
 /*********************
  *      DEFINES
@@ -31,7 +30,7 @@ extern "C" {
  **********************/
 
 typedef struct _lv_vg_lite_path_t lv_vg_lite_path_t;
-typedef struct _lv_draw_vg_lite_unit_t lv_draw_vg_lite_unit_t;
+struct _lv_draw_vg_lite_unit_t;
 
 typedef void (*lv_vg_lite_path_iter_cb_t)(void * user_data, uint8_t op_code, const float * data, uint32_t len);
 
@@ -39,17 +38,17 @@ typedef void (*lv_vg_lite_path_iter_cb_t)(void * user_data, uint8_t op_code, con
  * GLOBAL PROTOTYPES
  **********************/
 
-void lv_vg_lite_path_init(lv_draw_vg_lite_unit_t * unit);
+void lv_vg_lite_path_init(struct _lv_draw_vg_lite_unit_t * unit);
 
-void lv_vg_lite_path_deinit(lv_draw_vg_lite_unit_t * unit);
+void lv_vg_lite_path_deinit(struct _lv_draw_vg_lite_unit_t * unit);
 
 lv_vg_lite_path_t * lv_vg_lite_path_create(vg_lite_format_t data_format);
 
 void lv_vg_lite_path_destroy(lv_vg_lite_path_t * path);
 
-lv_vg_lite_path_t * lv_vg_lite_path_get(lv_draw_vg_lite_unit_t * unit, vg_lite_format_t data_format);
+lv_vg_lite_path_t * lv_vg_lite_path_get(struct _lv_draw_vg_lite_unit_t * unit, vg_lite_format_t data_format);
 
-void lv_vg_lite_path_drop(lv_draw_vg_lite_unit_t * unit, lv_vg_lite_path_t * path);
+void lv_vg_lite_path_drop(struct _lv_draw_vg_lite_unit_t * unit, lv_vg_lite_path_t * path);
 
 void lv_vg_lite_path_reset(lv_vg_lite_path_t * path, vg_lite_format_t data_format);
 
diff --git a/src/draw/vg_lite/lv_vg_lite_pending.c b/src/draw/vg_lite/lv_vg_lite_pending.c
index 141701a218..8bf5a3f5d6 100644
--- a/src/draw/vg_lite/lv_vg_lite_pending.c
+++ b/src/draw/vg_lite/lv_vg_lite_pending.c
@@ -11,6 +11,9 @@
 
 #if LV_USE_DRAW_VG_LITE
 
+#include "../../misc/lv_assert.h"
+#include "../../misc/lv_array.h"
+
 /*********************
  *      DEFINES
  *********************/
diff --git a/src/draw/vg_lite/lv_vg_lite_pending.h b/src/draw/vg_lite/lv_vg_lite_pending.h
index 22aba1455d..feb74c11ce 100644
--- a/src/draw/vg_lite/lv_vg_lite_pending.h
+++ b/src/draw/vg_lite/lv_vg_lite_pending.h
@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 
-#include "../../lvgl.h"
+#include "../../misc/lv_types.h"
 
 #if LV_USE_DRAW_VG_LITE
 
diff --git a/src/draw/vg_lite/lv_vg_lite_stroke.c b/src/draw/vg_lite/lv_vg_lite_stroke.c
index 4b786d81c8..89f20914d7 100644
--- a/src/draw/vg_lite/lv_vg_lite_stroke.c
+++ b/src/draw/vg_lite/lv_vg_lite_stroke.c
@@ -11,9 +11,8 @@
 
 #if LV_USE_DRAW_VG_LITE && LV_USE_VECTOR_GRAPHIC
 
-#include "lv_vg_lite_path.h"
 #include "lv_draw_vg_lite_type.h"
-#include "lv_vg_lite_math.h"
+#include "lv_vg_lite_path.h"
 #include "../lv_draw_vector_private.h"
 
 /*********************
diff --git a/src/draw/vg_lite/lv_vg_lite_utils.c b/src/draw/vg_lite/lv_vg_lite_utils.c
index dbe169caa6..87ba1cb581 100644
--- a/src/draw/vg_lite/lv_vg_lite_utils.c
+++ b/src/draw/vg_lite/lv_vg_lite_utils.c
@@ -7,18 +7,19 @@
  *      INCLUDES
  *********************/
 
-#include "../lv_image_decoder_private.h"
 #include "lv_vg_lite_utils.h"
 
 #if LV_USE_DRAW_VG_LITE
 
+#include "lv_draw_vg_lite_type.h"
 #include "lv_vg_lite_decoder.h"
 #include "lv_vg_lite_path.h"
 #include "lv_vg_lite_pending.h"
 #include "lv_vg_lite_grad.h"
-#include "lv_draw_vg_lite_type.h"
 #include "../../misc/lv_area_private.h"
-#include <string.h>
+#include "../../display/lv_display.h"
+#include "../../draw/lv_draw_image.h"
+#include "../lv_image_decoder_private.h"
 #include <math.h>
 
 /*********************
diff --git a/src/draw/vg_lite/lv_vg_lite_utils.h b/src/draw/vg_lite/lv_vg_lite_utils.h
index 4fa8ed208b..b24c31a827 100644
--- a/src/draw/vg_lite/lv_vg_lite_utils.h
+++ b/src/draw/vg_lite/lv_vg_lite_utils.h
@@ -14,13 +14,15 @@ extern "C" {
  *      INCLUDES
  *********************/
 
-#include "../../lvgl.h"
+#include "../../lv_conf_internal.h"
 
 #if LV_USE_DRAW_VG_LITE
 
 #include "../../misc/lv_profiler.h"
+#include "../../misc/lv_area.h"
+#include "../../misc/lv_style.h"
+#include "../../misc/lv_matrix.h"
 
-#include <stdbool.h>
 #if LV_USE_VG_LITE_THORVG
 #include "../../debugging/vg_lite_tvg/vg_lite.h"
 #else