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

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

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"

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

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

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

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"

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"

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"

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"

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"

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

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"

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"

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"

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"

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"

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"

src/draw/lv_draw_mask_private.h

@@ -15,6 +15,7 @@ extern "C" {
  *********************/
 
 #include "lv_draw_mask.h"
+#include "lv_draw.h"
 
 /*********************
  *      DEFINES

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"

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"

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
 

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
 

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

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"

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

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"

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
 

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

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"

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"

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"

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
 

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*/

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"

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

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"

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
 
 /*********************

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"

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
 

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"

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"

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"

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

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"

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"

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
 

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

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"

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"

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"

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

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"

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"
 

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*/
+#if LV_USE_THORVG_EXTERNAL
-typedef struct _Tvg_Paint Tvg_Paint;
+#include <thorvg_capi.h>
-typedef struct _Tvg_Canvas Tvg_Canvas;
+#else
-typedef struct _Tvg_Animation Tvg_Animation;
+#include "../../libs/thorvg/thorvg_capi.h"
 #endif
 
 typedef struct {

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
 

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"

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

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"

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

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"

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

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"

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
 

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"

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
 

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

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"

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

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"

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