fix(arc): add missing private include (#6648)

Co-authored-by: liamHowatt <liamjmh0@gmail.com>

69 files changed, 96 insertions, 71 deletions

diff --git a/src/core/lv_obj.c b/src/core/lv_obj.c
index ff4e087d1..ca2048e84 100644
--- a/src/core/lv_obj.c
+++ b/src/core/lv_obj.c
@@ -6,12 +6,12 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_obj_private.h"
 #include "../misc/lv_event_private.h"
 #include "../misc/lv_area_private.h"
 #include "lv_obj_style_private.h"
 #include "lv_obj_event_private.h"
 #include "lv_obj_class_private.h"
-#include "lv_obj_private.h"
 #include "../indev/lv_indev.h"
 #include "../indev/lv_indev_private.h"
 #include "lv_refr.h"
diff --git a/src/core/lv_obj_draw.c b/src/core/lv_obj_draw.c
index 4a11ddaac..b3694b9e5 100644
--- a/src/core/lv_obj_draw.c
+++ b/src/core/lv_obj_draw.c
@@ -12,6 +12,7 @@
 #include "../display/lv_display.h"
 #include "../indev/lv_indev.h"
 #include "../stdlib/lv_string.h"
+#include "../draw/lv_draw_arc.h"
 
 /*********************
  *      DEFINES
diff --git a/src/core/lv_obj_draw.h b/src/core/lv_obj_draw.h
index 7e0c26363..c0dbee431 100644
--- a/src/core/lv_obj_draw.h
+++ b/src/core/lv_obj_draw.h
@@ -14,7 +14,11 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "../misc/lv_types.h"
-#include "../draw/lv_draw.h"
+#include "../draw/lv_draw_rect.h"
+#include "../draw/lv_draw_label.h"
+#include "../draw/lv_draw_image.h"
+#include "../draw/lv_draw_line.h"
+#include "../draw/lv_draw_arc.h"
 
 /*********************
  *      DEFINES
diff --git a/src/core/lv_obj_property.c b/src/core/lv_obj_property.c
index 020794890..e9bc411d0 100644
--- a/src/core/lv_obj_property.c
+++ b/src/core/lv_obj_property.c
@@ -6,11 +6,11 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_obj_private.h"
 #include "../core/lv_obj.h"
 #include "../stdlib/lv_string.h"
 #include "../misc/lv_utils.h"
 #include "lv_obj_property.h"
-#include "lv_obj_private.h"
 #include "lv_obj_class_private.h"
 
 #if LV_USE_OBJ_PROPERTY
diff --git a/src/core/lv_obj_scroll.c b/src/core/lv_obj_scroll.c
index 727264b4b..fa5e16fc9 100644
--- a/src/core/lv_obj_scroll.c
+++ b/src/core/lv_obj_scroll.c
@@ -6,8 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../misc/lv_anim_private.h"
 #include "lv_obj_scroll_private.h"
+#include "../misc/lv_anim_private.h"
 #include "lv_obj_private.h"
 #include "../indev/lv_indev.h"
 #include "../indev/lv_indev_scroll.h"
diff --git a/src/core/lv_obj_style.c b/src/core/lv_obj_style.c
index ee1d5bd17..26bc39729 100644
--- a/src/core/lv_obj_style.c
+++ b/src/core/lv_obj_style.c
@@ -6,10 +6,10 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_obj_private.h"
 #include "../misc/lv_anim_private.h"
 #include "lv_obj_style_private.h"
 #include "lv_obj_class_private.h"
-#include "lv_obj_private.h"
 #include "../display/lv_display.h"
 #include "../display/lv_display_private.h"
 #include "../misc/lv_color.h"
diff --git a/src/core/lv_obj_tree.c b/src/core/lv_obj_tree.c
index 90bf44623..15c069e90 100644
--- a/src/core/lv_obj_tree.c
+++ b/src/core/lv_obj_tree.c
@@ -6,8 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_obj_class_private.h"
 #include "lv_obj_private.h"
+#include "lv_obj_class_private.h"
 #include "../indev/lv_indev.h"
 #include "../indev/lv_indev_private.h"
 #include "../display/lv_display.h"
diff --git a/src/core/lv_refr.c b/src/core/lv_refr.c
index 8575b5b20..813a00eb1 100644
--- a/src/core/lv_refr.c
+++ b/src/core/lv_refr.c
@@ -6,13 +6,13 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_refr_private.h"
+#include "lv_obj_draw_private.h"
 #include "../misc/lv_area_private.h"
 #include "../draw/sw/lv_draw_sw_mask_private.h"
 #include "../draw/lv_draw_mask_private.h"
 #include "lv_obj_private.h"
 #include "lv_obj_event_private.h"
-#include "lv_obj_draw_private.h"
-#include "lv_refr_private.h"
 #include "../display/lv_display.h"
 #include "../display/lv_display_private.h"
 #include "../tick/lv_tick.h"
diff --git a/src/display/lv_display.c b/src/display/lv_display.c
index 9f264e818..169e3d9c4 100644
--- a/src/display/lv_display.c
+++ b/src/display/lv_display.c
@@ -6,6 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "../display/lv_display_private.h"
 #include "../misc/lv_event_private.h"
 #include "../misc/lv_anim_private.h"
 #include "../draw/lv_draw_private.h"
@@ -13,7 +14,6 @@
 #include "lv_display.h"
 #include "../misc/lv_math.h"
 #include "../core/lv_refr_private.h"
-#include "../display/lv_display_private.h"
 #include "../stdlib/lv_string.h"
 #include "../themes/lv_theme.h"
 #include "../core/lv_global.h"
diff --git a/src/draw/lv_draw.h b/src/draw/lv_draw.h
index c4b112f8d..639a50145 100644
--- a/src/draw/lv_draw.h
+++ b/src/draw/lv_draw.h
@@ -245,17 +245,6 @@ void lv_draw_task_get_area(const lv_draw_task_t * t, lv_area_t * area);
  *      MACROS
  **********************/
 
-/**********************
- *   POST INCLUDES
- *********************/
-#include "lv_draw_rect.h"
-#include "lv_draw_label.h"
-#include "lv_draw_image.h"
-#include "lv_draw_arc.h"
-#include "lv_draw_line.h"
-#include "lv_draw_triangle.h"
-#include "lv_draw_mask.h"
-
 #ifdef __cplusplus
 } /*extern "C"*/
 #endif
diff --git a/src/draw/lv_draw_buf.c b/src/draw/lv_draw_buf.c
index d265b0217..300041230 100644
--- a/src/draw/lv_draw_buf.c
+++ b/src/draw/lv_draw_buf.c
@@ -6,8 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../misc/lv_types.h"
 #include "lv_draw_buf_private.h"
+#include "../misc/lv_types.h"
 #include "../stdlib/lv_string.h"
 #include "../core/lv_global.h"
 #include "../misc/lv_math.h"
diff --git a/src/draw/lv_draw_image.c b/src/draw/lv_draw_image.c
index 399a791e8..45804573e 100644
--- a/src/draw/lv_draw_image.c
+++ b/src/draw/lv_draw_image.c
@@ -6,10 +6,10 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_draw_image_private.h"
 #include "../misc/lv_area_private.h"
 #include "lv_image_decoder_private.h"
 #include "lv_draw_private.h"
-#include "lv_draw_image_private.h"
 #include "../display/lv_display.h"
 #include "../misc/lv_log.h"
 #include "../misc/lv_math.h"
diff --git a/src/draw/lv_draw_label.c b/src/draw/lv_draw_label.c
index d0162b824..95eb06354 100644
--- a/src/draw/lv_draw_label.c
+++ b/src/draw/lv_draw_label.c
@@ -6,12 +6,12 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_draw_label_private.h"
+#include "lv_draw_private.h"
 #include "../misc/lv_area_private.h"
 #include "lv_draw_vector_private.h"
 #include "lv_draw_rect_private.h"
-#include "lv_draw_private.h"
 #include "../core/lv_obj.h"
-#include "lv_draw_label_private.h"
 #include "../misc/lv_math.h"
 #include "../core/lv_obj_event.h"
 #include "../misc/lv_bidi_private.h"
diff --git a/src/draw/lv_draw_label.h b/src/draw/lv_draw_label.h
index bc36bbf5b..67afaf5c7 100644
--- a/src/draw/lv_draw_label.h
+++ b/src/draw/lv_draw_label.h
@@ -14,6 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_draw.h"
+#include "lv_draw_rect.h"
 #include "../misc/lv_bidi.h"
 #include "../misc/lv_text.h"
 #include "../misc/lv_color.h"
diff --git a/src/draw/lv_draw_mask.c b/src/draw/lv_draw_mask.c
index e9140da51..3ee6b62bc 100644
--- a/src/draw/lv_draw_mask.c
+++ b/src/draw/lv_draw_mask.c
@@ -6,8 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_draw_private.h"
 #include "lv_draw_mask_private.h"
+#include "lv_draw_private.h"
 #include "../core/lv_refr.h"
 #include "../misc/lv_math.h"
 #include "../misc/lv_types.h"
diff --git a/src/draw/lv_draw_mask.h b/src/draw/lv_draw_mask.h
index 410c0dbd3..6dfed79b3 100644
--- a/src/draw/lv_draw_mask.h
+++ b/src/draw/lv_draw_mask.h
@@ -13,7 +13,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_draw.h"
 #include "../misc/lv_color.h"
 #include "../misc/lv_area.h"
 #include "../misc/lv_style.h"
diff --git a/src/draw/lv_draw_mask_private.h b/src/draw/lv_draw_mask_private.h
index efb282b08..040df7ebe 100644
--- a/src/draw/lv_draw_mask_private.h
+++ b/src/draw/lv_draw_mask_private.h
@@ -15,6 +15,7 @@ extern "C" {
  *********************/
 
 #include "lv_draw_mask.h"
+#include "lv_draw.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/lv_draw_rect.c b/src/draw/lv_draw_rect.c
index 96439e320..ec2acc57a 100644
--- a/src/draw/lv_draw_rect.c
+++ b/src/draw/lv_draw_rect.c
@@ -6,9 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_draw_rect_private.h"
 #include "lv_draw_private.h"
 #include "../core/lv_obj.h"
-#include "lv_draw_rect_private.h"
 #include "../misc/lv_assert.h"
 #include "../core/lv_obj_event.h"
 #include "../stdlib/lv_string.h"
diff --git a/src/draw/lv_draw_triangle.c b/src/draw/lv_draw_triangle.c
index 8022d966a..44d5be3ff 100644
--- a/src/draw/lv_draw_triangle.c
+++ b/src/draw/lv_draw_triangle.c
@@ -6,9 +6,10 @@
 /*********************
  *      INCLUDES
  *********************/
+
+#include "lv_draw_triangle_private.h"
 #include "lv_draw_private.h"
 #include "../core/lv_obj.h"
-#include "lv_draw_triangle_private.h"
 #include "../misc/lv_math.h"
 #include "../stdlib/lv_mem.h"
 #include "../stdlib/lv_string.h"
diff --git a/src/draw/lv_draw_vector.c b/src/draw/lv_draw_vector.c
index d6d3cdfa7..28a08f289 100644
--- a/src/draw/lv_draw_vector.c
+++ b/src/draw/lv_draw_vector.c
@@ -6,9 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_draw_vector_private.h"
 #include "../misc/lv_area_private.h"
 #include "lv_draw_private.h"
-#include "lv_draw_vector_private.h"
 
 #if LV_USE_VECTOR_GRAPHIC
 
diff --git a/src/draw/lv_draw_vector.h b/src/draw/lv_draw_vector.h
index 06ce53ac5..38ce78ae1 100644
--- a/src/draw/lv_draw_vector.h
+++ b/src/draw/lv_draw_vector.h
@@ -13,9 +13,9 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_draw.h"
 #include "../misc/lv_array.h"
 #include "../misc/lv_matrix.h"
+#include "lv_draw_image.h"
 
 #if LV_USE_VECTOR_GRAPHIC
 
diff --git a/src/draw/sdl/lv_draw_sdl.h b/src/draw/sdl/lv_draw_sdl.h
index 2f48b535b..d9b061de1 100644
--- a/src/draw/sdl/lv_draw_sdl.h
+++ b/src/draw/sdl/lv_draw_sdl.h
@@ -22,6 +22,12 @@ extern "C" {
 #include "../../misc/lv_color.h"
 #include "../../display/lv_display.h"
 #include "../../osal/lv_os.h"
+#include "../../draw/lv_draw_label.h"
+#include "../../draw/lv_draw_rect.h"
+#include "../../draw/lv_draw_arc.h"
+#include "../../draw/lv_draw_image.h"
+#include "../../draw/lv_draw_triangle.h"
+#include "../../draw/lv_draw_line.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/sw/lv_draw_sw.c b/src/draw/sw/lv_draw_sw.c
index f1ac76686..9bbaff574 100644
--- a/src/draw/sw/lv_draw_sw.c
+++ b/src/draw/sw/lv_draw_sw.c
@@ -6,11 +6,11 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_draw_sw_private.h"
 #include "../lv_draw_private.h"
 #if LV_USE_DRAW_SW
 
 #include "../../core/lv_refr.h"
-#include "lv_draw_sw_private.h"
 #include "../../display/lv_display_private.h"
 #include "../../stdlib/lv_string.h"
 #include "../../core/lv_global.h"
diff --git a/src/draw/sw/lv_draw_sw.h b/src/draw/sw/lv_draw_sw.h
index bd00769e4..6463afd86 100644
--- a/src/draw/sw/lv_draw_sw.h
+++ b/src/draw/sw/lv_draw_sw.h
@@ -21,7 +21,12 @@ extern "C" {
 #include "../../display/lv_display.h"
 #include "../../osal/lv_os.h"
 
-#include "../../draw/lv_draw_vector.h"
+#include "../lv_draw_vector.h"
+#include "../lv_draw_triangle.h"
+#include "../lv_draw_label.h"
+#include "../lv_draw_image.h"
+#include "../lv_draw_line.h"
+#include "../lv_draw_arc.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/sw/lv_draw_sw_mask.c b/src/draw/sw/lv_draw_sw_mask.c
index 983413a27..c4fd79220 100644
--- a/src/draw/sw/lv_draw_sw_mask.c
+++ b/src/draw/sw/lv_draw_sw_mask.c
@@ -6,11 +6,11 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_draw_sw_mask_private.h"
 #include "../lv_draw_mask_private.h"
 #include "../lv_draw.h"
 
 #if LV_DRAW_SW_COMPLEX
-#include "lv_draw_sw_mask_private.h"
 #include "../../core/lv_global.h"
 #include "../../misc/lv_math.h"
 #include "../../misc/lv_log.h"
diff --git a/src/draw/sw/lv_draw_sw_private.h b/src/draw/sw/lv_draw_sw_private.h
index 419218851..38ba3b4c7 100644
--- a/src/draw/sw/lv_draw_sw_private.h
+++ b/src/draw/sw/lv_draw_sw_private.h
@@ -15,6 +15,7 @@ extern "C" {
  *********************/
 
 #include "lv_draw_sw.h"
+#include "../lv_draw_private.h"
 
 #if LV_USE_DRAW_SW
 
diff --git a/src/draw/vg_lite/lv_draw_vg_lite.h b/src/draw/vg_lite/lv_draw_vg_lite.h
index 1d01fd602..63ff7f504 100644
--- a/src/draw/vg_lite/lv_draw_vg_lite.h
+++ b/src/draw/vg_lite/lv_draw_vg_lite.h
@@ -20,6 +20,12 @@ extern "C" {
 
 #include "../lv_draw.h"
 #include "../../draw/lv_draw_vector.h"
+#include "../../draw/lv_draw_arc.h"
+#include "../../draw/lv_draw_rect.h"
+#include "../../draw/lv_draw_image.h"
+#include "../../draw/lv_draw_label.h"
+#include "../../draw/lv_draw_line.h"
+#include "../../draw/lv_draw_triangle.h"
 
 /*********************
  *      DEFINES
diff --git a/src/indev/lv_indev.c b/src/indev/lv_indev.c
index e2bbe40dd..016a2f3c6 100644
--- a/src/indev/lv_indev.c
+++ b/src/indev/lv_indev.c
@@ -1,3 +1,4 @@
+#include "lv_indev_private.h"
 #include "../misc/lv_event_private.h"
 #include "../misc/lv_area_private.h"
 #include "../misc/lv_anim_private.h"
@@ -10,7 +11,6 @@
 /*********************
  *      INCLUDES
  ********************/
-#include "lv_indev_private.h"
 #include "lv_indev_scroll.h"
 #include "../display/lv_display_private.h"
 #include "../core/lv_global.h"
diff --git a/src/others/file_explorer/lv_file_explorer.c b/src/others/file_explorer/lv_file_explorer.c
index 1d9059437..bb0220c89 100644
--- a/src/others/file_explorer/lv_file_explorer.c
+++ b/src/others/file_explorer/lv_file_explorer.c
@@ -6,9 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_file_explorer_private.h"
 #include "../../misc/lv_fs_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_file_explorer_private.h"
 #if LV_USE_FILE_EXPLORER != 0
 
 #include "../../lvgl.h"
diff --git a/src/others/ime/lv_ime_pinyin.c b/src/others/ime/lv_ime_pinyin.c
index 0bcc76fd2..08f43a143 100644
--- a/src/others/ime/lv_ime_pinyin.c
+++ b/src/others/ime/lv_ime_pinyin.c
@@ -6,8 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../core/lv_obj_class_private.h"
 #include "lv_ime_pinyin_private.h"
+#include "../../core/lv_obj_class_private.h"
 #if LV_USE_IME_PINYIN != 0
 
 #include "../../lvgl.h"
diff --git a/src/others/sysmon/lv_sysmon.c b/src/others/sysmon/lv_sysmon.c
index 59fee7078..1814dddf9 100644
--- a/src/others/sysmon/lv_sysmon.c
+++ b/src/others/sysmon/lv_sysmon.c
@@ -7,8 +7,8 @@
  *      INCLUDES
  *********************/
 
-#include "../../misc/lv_timer_private.h"
 #include "lv_sysmon_private.h"
+#include "../../misc/lv_timer_private.h"
 
 #if LV_USE_SYSMON
 
diff --git a/src/widgets/animimage/lv_animimage.c b/src/widgets/animimage/lv_animimage.c
index 3c6ed50cd..11ec7ca1c 100644
--- a/src/widgets/animimage/lv_animimage.c
+++ b/src/widgets/animimage/lv_animimage.c
@@ -6,8 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../core/lv_obj_class_private.h"
 #include "lv_animimage_private.h"
+#include "../../core/lv_obj_class_private.h"
 #if LV_USE_ANIMIMG != 0
 
 /*Testing of dependencies*/
diff --git a/src/widgets/arc/lv_arc.c b/src/widgets/arc/lv_arc.c
index 8ddd6aba6..7e4315c29 100644
--- a/src/widgets/arc/lv_arc.c
+++ b/src/widgets/arc/lv_arc.c
@@ -6,11 +6,11 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_arc_private.h"
 #include "../../misc/lv_area_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_event_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_arc_private.h"
 #if LV_USE_ARC != 0
 
 #include "../../core/lv_group.h"
diff --git a/src/widgets/arc/lv_arc_private.h b/src/widgets/arc/lv_arc_private.h
index c784a6f6a..03513ea60 100644
--- a/src/widgets/arc/lv_arc_private.h
+++ b/src/widgets/arc/lv_arc_private.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-
+#include "../../core/lv_obj_private.h"
 #include "lv_arc.h"
 
 #if LV_USE_ARC != 0
diff --git a/src/widgets/bar/lv_bar.c b/src/widgets/bar/lv_bar.c
index 6ca271b82..6fc7b231a 100644
--- a/src/widgets/bar/lv_bar.c
+++ b/src/widgets/bar/lv_bar.c
@@ -6,11 +6,11 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_bar_private.h"
 #include "../../misc/lv_area_private.h"
 #include "../../draw/lv_draw_mask_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_bar_private.h"
 #if LV_USE_BAR != 0
 
 #include "../../draw/lv_draw.h"
diff --git a/src/widgets/button/lv_button.c b/src/widgets/button/lv_button.c
index b6cba65b5..096dc2954 100644
--- a/src/widgets/button/lv_button.c
+++ b/src/widgets/button/lv_button.c
@@ -7,8 +7,8 @@
  *      INCLUDES
  *********************/
 
-#include "../../core/lv_obj_class_private.h"
 #include "lv_button_private.h"
+#include "../../core/lv_obj_class_private.h"
 #if LV_USE_BUTTON != 0
 
 /*********************
diff --git a/src/widgets/buttonmatrix/lv_buttonmatrix.c b/src/widgets/buttonmatrix/lv_buttonmatrix.c
index a48b8e123..b05602de4 100644
--- a/src/widgets/buttonmatrix/lv_buttonmatrix.c
+++ b/src/widgets/buttonmatrix/lv_buttonmatrix.c
@@ -6,10 +6,10 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_buttonmatrix_private.h"
 #include "../../misc/lv_area_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_buttonmatrix_private.h"
 #if LV_USE_BUTTONMATRIX != 0
 
 #include "../../misc/lv_assert.h"
diff --git a/src/widgets/calendar/lv_calendar.c b/src/widgets/calendar/lv_calendar.c
index ef78d9dec..560e24a1d 100644
--- a/src/widgets/calendar/lv_calendar.c
+++ b/src/widgets/calendar/lv_calendar.c
@@ -6,9 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_calendar_private.h"
 #include "../../draw/lv_draw_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_calendar_private.h"
 #include "../../../lvgl.h"
 #if LV_USE_CALENDAR
 
diff --git a/src/widgets/canvas/lv_canvas.c b/src/widgets/canvas/lv_canvas.c
index a34886588..a4ccdd714 100644
--- a/src/widgets/canvas/lv_canvas.c
+++ b/src/widgets/canvas/lv_canvas.c
@@ -6,8 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../core/lv_obj_class_private.h"
 #include "lv_canvas_private.h"
+#include "../../core/lv_obj_class_private.h"
 #if LV_USE_CANVAS != 0
 #include "../../misc/lv_assert.h"
 #include "../../misc/lv_math.h"
diff --git a/src/widgets/chart/lv_chart.c b/src/widgets/chart/lv_chart.c
index 9b7dd9ed1..89fc95b5a 100644
--- a/src/widgets/chart/lv_chart.c
+++ b/src/widgets/chart/lv_chart.c
@@ -6,11 +6,11 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_chart_private.h"
 #include "../../misc/lv_area_private.h"
 #include "../../draw/lv_draw_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_chart_private.h"
 #if LV_USE_CHART != 0
 
 #include "../../misc/lv_assert.h"
diff --git a/src/widgets/checkbox/lv_checkbox.c b/src/widgets/checkbox/lv_checkbox.c
index 84715da61..7a987ef3e 100644
--- a/src/widgets/checkbox/lv_checkbox.c
+++ b/src/widgets/checkbox/lv_checkbox.c
@@ -6,9 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_checkbox_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_checkbox_private.h"
 #if LV_USE_CHECKBOX != 0
 
 #include "../../misc/lv_assert.h"
diff --git a/src/widgets/checkbox/lv_checkbox_private.h b/src/widgets/checkbox/lv_checkbox_private.h
index dabc05d18..c927b65f2 100644
--- a/src/widgets/checkbox/lv_checkbox_private.h
+++ b/src/widgets/checkbox/lv_checkbox_private.h
@@ -17,6 +17,7 @@ extern "C" {
 #include "lv_checkbox.h"
 
 #if LV_USE_CHECKBOX != 0
+#include "../../core/lv_obj_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/widgets/dropdown/lv_dropdown.c b/src/widgets/dropdown/lv_dropdown.c
index 354ad1aab..1b34b44fc 100644
--- a/src/widgets/dropdown/lv_dropdown.c
+++ b/src/widgets/dropdown/lv_dropdown.c
@@ -6,10 +6,10 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_dropdown_private.h"
 #include "../../misc/lv_area_private.h"
 #include "../../core/lv_obj_class_private.h"
 #include "../../core/lv_obj.h"
-#include "lv_dropdown_private.h"
 #if LV_USE_DROPDOWN != 0
 
 #include "../../misc/lv_assert.h"
diff --git a/src/widgets/image/lv_image.c b/src/widgets/image/lv_image.c
index e1cd2058e..147429436 100644
--- a/src/widgets/image/lv_image.c
+++ b/src/widgets/image/lv_image.c
@@ -6,12 +6,12 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_image_private.h"
 #include "../../misc/lv_area_private.h"
 #include "../../draw/lv_draw_image_private.h"
 #include "../../draw/lv_draw_private.h"
 #include "../../core/lv_obj_event_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_image_private.h"
 #if LV_USE_IMAGE != 0
 
 #include "../../stdlib/lv_string.h"
diff --git a/src/widgets/imagebutton/lv_imagebutton.c b/src/widgets/imagebutton/lv_imagebutton.c
index 7a76c4ebd..3aef3a42b 100644
--- a/src/widgets/imagebutton/lv_imagebutton.c
+++ b/src/widgets/imagebutton/lv_imagebutton.c
@@ -6,13 +6,13 @@
 /*********************
  *      INCLUDES
  *********************/
-
+#include "lv_imagebutton_private.h"
 #include "../../misc/lv_area_private.h"
 #include "../../draw/lv_draw_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_event_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_imagebutton_private.h"
+
 
 #if LV_USE_IMAGEBUTTON != 0
 
diff --git a/src/widgets/imagebutton/lv_imagebutton_private.h b/src/widgets/imagebutton/lv_imagebutton_private.h
index d061fd8e5..bf9c4ef24 100644
--- a/src/widgets/imagebutton/lv_imagebutton_private.h
+++ b/src/widgets/imagebutton/lv_imagebutton_private.h
@@ -17,6 +17,7 @@ extern "C" {
 #include "lv_imagebutton.h"
 
 #if LV_USE_IMAGEBUTTON != 0
+#include "../../core/lv_obj_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/widgets/keyboard/lv_keyboard.c b/src/widgets/keyboard/lv_keyboard.c
index 56f9ae792..050a62a7c 100644
--- a/src/widgets/keyboard/lv_keyboard.c
+++ b/src/widgets/keyboard/lv_keyboard.c
@@ -7,8 +7,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../core/lv_obj_class_private.h"
 #include "lv_keyboard_private.h"
+#include "../../core/lv_obj_class_private.h"
 #if LV_USE_KEYBOARD
 
 #include "../textarea/lv_textarea.h"
diff --git a/src/widgets/label/lv_label.c b/src/widgets/label/lv_label.c
index c99ade155..ae0711251 100644
--- a/src/widgets/label/lv_label.c
+++ b/src/widgets/label/lv_label.c
@@ -6,11 +6,11 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_label_private.h"
 #include "../../misc/lv_area_private.h"
 #include "../../misc/lv_anim_private.h"
 #include "../../draw/lv_draw_label_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_label_private.h"
 #if LV_USE_LABEL != 0
 #include "../../core/lv_obj_private.h"
 #include "../../misc/lv_assert.h"
diff --git a/src/widgets/led/lv_led.c b/src/widgets/led/lv_led.c
index d42daabcb..6a8c29bbf 100644
--- a/src/widgets/led/lv_led.c
+++ b/src/widgets/led/lv_led.c
@@ -6,9 +6,10 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_led_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_led_private.h"
+
 #if LV_USE_LED
 
 #include "../../misc/lv_assert.h"
diff --git a/src/widgets/led/lv_led_private.h b/src/widgets/led/lv_led_private.h
index ccd312b3c..af76b4fb9 100644
--- a/src/widgets/led/lv_led_private.h
+++ b/src/widgets/led/lv_led_private.h
@@ -17,6 +17,7 @@ extern "C" {
 #include "lv_led.h"
 
 #if LV_USE_LED
+#include "../../core/lv_obj_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/widgets/line/lv_line.c b/src/widgets/line/lv_line.c
index d5a37aa68..a251aae72 100644
--- a/src/widgets/line/lv_line.c
+++ b/src/widgets/line/lv_line.c
@@ -6,8 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../core/lv_obj_class_private.h"
 #include "lv_line_private.h"
+#include "../../core/lv_obj_class_private.h"
+
 
 #if LV_USE_LINE != 0
 #include "../../misc/lv_assert.h"
diff --git a/src/widgets/lottie/lv_lottie.c b/src/widgets/lottie/lv_lottie.c
index bc0bed586..48ae25814 100644
--- a/src/widgets/lottie/lv_lottie.c
+++ b/src/widgets/lottie/lv_lottie.c
@@ -6,6 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_lottie_private.h"
 #include "../../lv_conf_internal.h"
 #if LV_USE_LOTTIE
 
@@ -15,7 +16,6 @@
     #include "../../libs/thorvg/thorvg_capi.h"
 #endif
 
-#include "lv_lottie_private.h"
 #include "../../misc/lv_timer.h"
 #include "../../core/lv_obj_class_private.h"
 
diff --git a/src/widgets/lottie/lv_lottie_private.h b/src/widgets/lottie/lv_lottie_private.h
index 1fec92d37..6362afb89 100644
--- a/src/widgets/lottie/lv_lottie_private.h
+++ b/src/widgets/lottie/lv_lottie_private.h
@@ -14,6 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 
+#include "../../lv_conf_internal.h"
 #if LV_USE_LOTTIE
 
 #include "lv_lottie.h"
@@ -27,10 +28,10 @@ extern "C" {
  *      TYPEDEFS
  **********************/
 
-#ifndef __THORVG_CAPI_H__ /*To avoid redefinition of typedef warning*/
-typedef struct _Tvg_Paint Tvg_Paint;
-typedef struct _Tvg_Canvas Tvg_Canvas;
-typedef struct _Tvg_Animation Tvg_Animation;
+#if LV_USE_THORVG_EXTERNAL
+#include <thorvg_capi.h>
+#else
+#include "../../libs/thorvg/thorvg_capi.h"
 #endif
 
 typedef struct {
diff --git a/src/widgets/menu/lv_menu.c b/src/widgets/menu/lv_menu.c
index 8b2ea05b8..f9b49fc0e 100644
--- a/src/widgets/menu/lv_menu.c
+++ b/src/widgets/menu/lv_menu.c
@@ -6,8 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../core/lv_obj_class_private.h"
 #include "lv_menu_private.h"
+#include "../../core/lv_obj_class_private.h"
 
 #if LV_USE_MENU
 
diff --git a/src/widgets/msgbox/lv_msgbox.c b/src/widgets/msgbox/lv_msgbox.c
index 8a9997726..98ad81e16 100644
--- a/src/widgets/msgbox/lv_msgbox.c
+++ b/src/widgets/msgbox/lv_msgbox.c
@@ -6,9 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_msgbox_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_msgbox_private.h"
 #if LV_USE_MSGBOX
 
 #include "../label/lv_label.h"
diff --git a/src/widgets/msgbox/lv_msgbox_private.h b/src/widgets/msgbox/lv_msgbox_private.h
index ebf660170..640a39cbd 100644
--- a/src/widgets/msgbox/lv_msgbox_private.h
+++ b/src/widgets/msgbox/lv_msgbox_private.h
@@ -17,6 +17,7 @@ extern "C" {
 #include "lv_msgbox.h"
 
 #if LV_USE_MSGBOX
+#include "../../core/lv_obj_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/widgets/roller/lv_roller.c b/src/widgets/roller/lv_roller.c
index 08b692dad..4c7893ed6 100644
--- a/src/widgets/roller/lv_roller.c
+++ b/src/widgets/roller/lv_roller.c
@@ -6,12 +6,12 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_roller_private.h"
 #include "../label/lv_label_private.h"
 #include "../../misc/lv_area_private.h"
 #include "../../misc/lv_anim_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_roller_private.h"
 #if LV_USE_ROLLER != 0
 
 #include "../../misc/lv_assert.h"
diff --git a/src/widgets/roller/lv_roller_private.h b/src/widgets/roller/lv_roller_private.h
index f648d70e7..b1f61ef62 100644
--- a/src/widgets/roller/lv_roller_private.h
+++ b/src/widgets/roller/lv_roller_private.h
@@ -17,6 +17,7 @@ extern "C" {
 #include "lv_roller.h"
 
 #if LV_USE_ROLLER != 0
+#include "../../core/lv_obj_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/widgets/scale/lv_scale.c b/src/widgets/scale/lv_scale.c
index b6de17e90..9663e4f54 100644
--- a/src/widgets/scale/lv_scale.c
+++ b/src/widgets/scale/lv_scale.c
@@ -6,9 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_scale_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_scale_private.h"
 #if LV_USE_SCALE != 0
 
 #include "../../core/lv_group.h"
diff --git a/src/widgets/scale/lv_scale_private.h b/src/widgets/scale/lv_scale_private.h
index cc9363f76..c755c1774 100644
--- a/src/widgets/scale/lv_scale_private.h
+++ b/src/widgets/scale/lv_scale_private.h
@@ -17,6 +17,7 @@ extern "C" {
 #include "lv_scale.h"
 
 #if LV_USE_SCALE != 0
+#include "../../core/lv_obj_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/widgets/slider/lv_slider.c b/src/widgets/slider/lv_slider.c
index 31297577e..e58597c88 100644
--- a/src/widgets/slider/lv_slider.c
+++ b/src/widgets/slider/lv_slider.c
@@ -6,11 +6,11 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_slider_private.h"
 #include "../../misc/lv_area_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_event_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_slider_private.h"
 #if LV_USE_SLIDER != 0
 
 #include "../../misc/lv_assert.h"
diff --git a/src/widgets/span/lv_span.c b/src/widgets/span/lv_span.c
index 5e5291008..a6a287e94 100644
--- a/src/widgets/span/lv_span.c
+++ b/src/widgets/span/lv_span.c
@@ -6,10 +6,10 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_span_private.h"
 #include "../../misc/lv_area_private.h"
 #include "../../draw/lv_draw_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_span_private.h"
 
 #if LV_USE_SPAN != 0
 
diff --git a/src/widgets/spinbox/lv_spinbox.c b/src/widgets/spinbox/lv_spinbox.c
index 5ee9f465b..1b791e1e5 100644
--- a/src/widgets/spinbox/lv_spinbox.c
+++ b/src/widgets/spinbox/lv_spinbox.c
@@ -6,8 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../core/lv_obj_class_private.h"
 #include "lv_spinbox_private.h"
+#include "../../core/lv_obj_class_private.h"
 #if LV_USE_SPINBOX
 
 #include "../../misc/lv_assert.h"
diff --git a/src/widgets/switch/lv_switch.c b/src/widgets/switch/lv_switch.c
index 8aa6bbe4e..89b4b6363 100644
--- a/src/widgets/switch/lv_switch.c
+++ b/src/widgets/switch/lv_switch.c
@@ -6,9 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_switch_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_switch_private.h"
 
 #if LV_USE_SWITCH != 0
 
diff --git a/src/widgets/switch/lv_switch_private.h b/src/widgets/switch/lv_switch_private.h
index 7f43d37b1..7bc25763c 100644
--- a/src/widgets/switch/lv_switch_private.h
+++ b/src/widgets/switch/lv_switch_private.h
@@ -17,6 +17,7 @@ extern "C" {
 #include "lv_switch.h"
 
 #if LV_USE_SWITCH != 0
+#include "../../core/lv_obj_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/widgets/table/lv_table.c b/src/widgets/table/lv_table.c
index a55c0fc7e..affb99b88 100644
--- a/src/widgets/table/lv_table.c
+++ b/src/widgets/table/lv_table.c
@@ -6,10 +6,10 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_table_private.h"
 #include "../../misc/lv_area_private.h"
 #include "../../core/lv_obj_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_table_private.h"
 #if LV_USE_TABLE != 0
 
 #include "../../indev/lv_indev.h"
diff --git a/src/widgets/table/lv_table_private.h b/src/widgets/table/lv_table_private.h
index 901fc30e0..498ef5e28 100644
--- a/src/widgets/table/lv_table_private.h
+++ b/src/widgets/table/lv_table_private.h
@@ -17,6 +17,7 @@ extern "C" {
 #include "lv_table.h"
 
 #if LV_USE_TABLE != 0
+#include "../../core/lv_obj_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/widgets/textarea/lv_textarea.c b/src/widgets/textarea/lv_textarea.c
index 6a8600deb..02f1b1614 100644
--- a/src/widgets/textarea/lv_textarea.c
+++ b/src/widgets/textarea/lv_textarea.c
@@ -6,9 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
+#include "lv_textarea_private.h"
 #include "../label/lv_label_private.h"
 #include "../../core/lv_obj_class_private.h"
-#include "lv_textarea_private.h"
 #if LV_USE_TEXTAREA != 0
 
 #include "../../core/lv_group.h"
diff --git a/src/widgets/tileview/lv_tileview.c b/src/widgets/tileview/lv_tileview.c
index 86a5db3c3..8844a89ae 100644
--- a/src/widgets/tileview/lv_tileview.c
+++ b/src/widgets/tileview/lv_tileview.c
@@ -6,8 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../core/lv_obj_class_private.h"
 #include "lv_tileview_private.h"
+#include "../../core/lv_obj_class_private.h"
 #include "../../indev/lv_indev.h"
 #include "../../indev/lv_indev_private.h"
 #if LV_USE_TILEVIEW