diff --git a/lv_app/lv_app_util/lv_app_notice.c b/lv_app/lv_app_util/lv_app_notice.c index 12326e670..d49e7e7e2 100644 --- a/lv_app/lv_app_util/lv_app_notice.c +++ b/lv_app/lv_app_util/lv_app_notice.c @@ -9,8 +9,8 @@ #include "lv_app_notice.h" #if USE_LV_APP_NOTICE != 0 -#include -#include "lvgl/lv_objx/lv_label.h" +#include "../../lv_objx/lv_cont.h" +#include "../../lv_objx/lv_label.h" #include "misc/gfx/anim.h" #include diff --git a/lv_appx/lv_app_terminal.c b/lv_appx/lv_app_terminal.c index f422ec6bc..228feccfd 100644 --- a/lv_appx/lv_app_terminal.c +++ b/lv_appx/lv_app_terminal.c @@ -7,17 +7,15 @@ * INCLUDES *********************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "lv_conf.h" +#include "../lv_obj/lv_dispi.h" +#include "../lv_obj/lv_obj.h" +#include "../lv_objx/lv_btn.h" +#include "../lv_objx/lv_cont.h" +#include "../lv_objx/lv_ddlist.h" +#include "../lv_objx/lv_label.h" +#include "../lv_objx/lv_page.h" +#include "../lv_objx/lv_ta.h" #include #include #include diff --git a/lv_draw/lv_draw_vbasic.c b/lv_draw/lv_draw_vbasic.c index 51760f75a..d3f543c6e 100644 --- a/lv_draw/lv_draw_vbasic.c +++ b/lv_draw/lv_draw_vbasic.c @@ -15,7 +15,7 @@ #if LV_VDB_SIZE != 0 #include -#include "lvgl/lv_obj/lv_vdb.h" +#include "../lv_obj/lv_vdb.h" /********************* * INCLUDES diff --git a/lv_obj/lv_obj.c b/lv_obj/lv_obj.c index 0b9bf896b..d71108b31 100644 --- a/lv_obj/lv_obj.c +++ b/lv_obj/lv_obj.c @@ -8,14 +8,13 @@ *********************/ #include "lv_conf.h" -#include "lvgl/lv_draw/lv_draw.h" -#include "lvgl/lv_obj/lv_dispi.h" -#include "lvgl/lv_obj/lv_obj.h" -#include "lvgl/lv_obj/lv_refr.h" -#include "lvgl/lv_obj/lv_group.h" -#include "lvgl/lv_app/lv_app.h" -#include "lvgl/lv_draw/lv_draw_rbasic.h" +#include "../lv_draw/lv_draw.h" +#include "../lv_draw/lv_draw_rbasic.h" +#include "lv_dispi.h" +#include "lv_obj.h" +#include "lv_refr.h" #include "lv_group.h" +#include "../lv_app/lv_app.h" #include "misc/gfx/anim.h" #include "hal/indev/indev.h" #include diff --git a/lv_objx/lv_bar.c b/lv_objx/lv_bar.c index 1cbcfb2e5..805c0a080 100644 --- a/lv_objx/lv_bar.c +++ b/lv_objx/lv_bar.c @@ -11,7 +11,7 @@ #include "lv_conf.h" #if USE_LV_BAR != 0 -#include +#include "lv_bar.h" #include "../lv_draw/lv_draw.h" #include "misc/gfx/anim.h" #include diff --git a/lv_objx/lv_bar.h b/lv_objx/lv_bar.h index a33cc2adf..f42b942e9 100644 --- a/lv_objx/lv_bar.h +++ b/lv_objx/lv_bar.h @@ -17,7 +17,7 @@ extern "C" { #if USE_LV_BAR != 0 #include "../lv_obj/lv_obj.h" -#include +#include "lv_cont.h" #include "lv_btn.h" #include "lv_label.h" diff --git a/lv_objx/lv_btn.h b/lv_objx/lv_btn.h index b9fe72ad7..6d1cd0abc 100644 --- a/lv_objx/lv_btn.h +++ b/lv_objx/lv_btn.h @@ -21,7 +21,7 @@ extern "C" { #error "lv_btn: lv_cont is required. Enable it in lv_conf.h (USE_LV_CONT 1) " #endif -#include +#include "lv_cont.h" #include "../lv_obj/lv_dispi.h" /********************* diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c index 600b627e0..80d57d85b 100644 --- a/lv_objx/lv_ddlist.c +++ b/lv_objx/lv_ddlist.c @@ -12,8 +12,9 @@ #include "lv_ddlist.h" #include "../lv_draw/lv_draw.h" -#include "misc/gfx/anim.h" #include "../lv_obj/lv_group.h" +#include "../lv_obj/lv_dispi.h" +#include "misc/gfx/anim.h" /********************* * DEFINES diff --git a/lv_objx/lv_line.h b/lv_objx/lv_line.h index a1a020e67..66ed3e792 100644 --- a/lv_objx/lv_line.h +++ b/lv_objx/lv_line.h @@ -16,7 +16,7 @@ extern "C" { #include "lv_conf.h" #if USE_LV_LINE != 0 -#include "lvgl/lv_obj/lv_obj.h" +#include "../lv_obj/lv_obj.h" /********************* * DEFINES diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c index 9fab2bf51..efcbe4fd6 100644 --- a/lv_objx/lv_list.c +++ b/lv_objx/lv_list.c @@ -10,8 +10,8 @@ #if USE_LV_LIST != 0 #include "lv_list.h" -#include "lvgl/lv_obj/lv_group.h" -#include "lvgl/lv_objx/lv_cont.h" +#include "../lv_obj/lv_group.h" +#include "lv_cont.h" #include "misc/gfx/anim.h" #include "misc/math/math_base.h" diff --git a/lv_objx/lv_mbox.c b/lv_objx/lv_mbox.c index f63c206cf..a414c6b7b 100644 --- a/lv_objx/lv_mbox.c +++ b/lv_objx/lv_mbox.c @@ -11,7 +11,7 @@ #if USE_LV_MBOX != 0 #include "lv_mbox.h" -#include "lvgl/lv_obj/lv_group.h" +#include "../lv_obj/lv_group.h" #include "misc/gfx/anim.h" #include "misc/math/math_base.h" diff --git a/lv_objx/lv_mbox.h b/lv_objx/lv_mbox.h index 69ce1b804..261a5611a 100644 --- a/lv_objx/lv_mbox.h +++ b/lv_objx/lv_mbox.h @@ -31,7 +31,7 @@ extern "C" { #include "../lv_obj/lv_obj.h" -#include +#include "lv_cont.h" #include "lv_btn.h" #include "lv_label.h" diff --git a/lv_objx/lv_page.h b/lv_objx/lv_page.h index e8f5503cc..c2cdbc7af 100644 --- a/lv_objx/lv_page.h +++ b/lv_objx/lv_page.h @@ -21,8 +21,7 @@ extern "C" { #error "lv_page: lv_cont is required. Enable it in lv_conf.h (USE_LV_CONT 1) " #endif -#include "../lv_obj/lv_obj.h" -#include "lvgl/lv_objx/lv_cont.h" +#include "lv_cont.h" #include "../lv_obj/lv_dispi.h" /********************* diff --git a/lv_objx/lv_slider.c b/lv_objx/lv_slider.c index 4eaec2bb5..929ec7267 100644 --- a/lv_objx/lv_slider.c +++ b/lv_objx/lv_slider.c @@ -10,9 +10,9 @@ #if USE_LV_SLIDER != 0 #include "lv_slider.h" -#include "lvgl/lv_obj/lv_group.h" -#include "misc/math/math_base.h" +#include "../lv_obj/lv_group.h" #include "../lv_draw/lv_draw.h" +#include "misc/math/math_base.h" /********************* * DEFINES diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c index 612a363bc..3bb9ad233 100644 --- a/lv_objx/lv_ta.c +++ b/lv_objx/lv_ta.c @@ -11,9 +11,9 @@ #if USE_LV_TA != 0 #include "lv_ta.h" -#include "lvgl/lv_obj/lv_group.h" -#include "misc/gfx/anim.h" +#include "../lv_obj/lv_group.h" #include "../lv_draw/lv_draw.h" +#include "misc/gfx/anim.h" /********************* * DEFINES diff --git a/lv_objx/lv_win.h b/lv_objx/lv_win.h index ec918c55b..9ea051359 100644 --- a/lv_objx/lv_win.h +++ b/lv_objx/lv_win.h @@ -35,7 +35,7 @@ extern "C" { #endif #include "../lv_obj/lv_obj.h" -#include +#include "lv_cont.h" #include "lv_btn.h" #include "lv_label.h" #include "lv_img.h"