diff --git a/lv_draw/lv_draw.c b/lv_draw/lv_draw.c
index 6c9132cc15..3db2c601d3 100644
--- a/lv_draw/lv_draw.c
+++ b/lv_draw/lv_draw.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #include <stdio.h>
 #include <stdbool.h>
diff --git a/lv_draw/lv_draw_rbasic.c b/lv_draw/lv_draw_rbasic.c
index 4ef0a8da84..5b30f9edad 100644
--- a/lv_draw/lv_draw_rbasic.c
+++ b/lv_draw/lv_draw_rbasic.c
@@ -8,7 +8,7 @@
  *********************/
 #include "../lv_hal/lv_hal_disp.h"
 #include "lv_draw_rbasic.h"
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #include "../lv_misc/lv_font.h"
 
 /*********************
diff --git a/lv_draw/lv_draw_vbasic.c b/lv_draw/lv_draw_vbasic.c
index 42bf4cb2b4..79c86eabc8 100644
--- a/lv_draw/lv_draw_vbasic.c
+++ b/lv_draw/lv_draw_vbasic.c
@@ -3,7 +3,7 @@
  * 
  */
 
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/lv_draw/lv_draw_vbasic.h b/lv_draw/lv_draw_vbasic.h
index 8221ee5a8a..3cf48b897f 100644
--- a/lv_draw/lv_draw_vbasic.h
+++ b/lv_draw/lv_draw_vbasic.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #if LV_VDB_SIZE != 0
 
diff --git a/lv_misc/lv_anim.c b/lv_misc/lv_anim.c
index 0cdc70f9fa..09b3bf68b6 100644
--- a/lv_misc/lv_anim.c
+++ b/lv_misc/lv_anim.c
@@ -6,9 +6,10 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #include <stddef.h>
 #include <string.h>
+#include "../lv_hal/lv_hal_tick.h"
 #include "lv_task.h"
 #include "lv_anim.h"
 #include "lv_math.h"
diff --git a/lv_misc/lv_color.h b/lv_misc/lv_color.h
index ce5f5715df..a995e3bfd7 100644
--- a/lv_misc/lv_color.h
+++ b/lv_misc/lv_color.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #include <stdint.h>
 
@@ -304,8 +304,8 @@ lv_color_hsv_t lv_color_rgb_to_hsv(uint8_t r, uint8_t g, uint8_t b);
  *      MACROS
  **********************/
 
-#endif /*USE_COLOR*/
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
+
+#endif /*USE_COLOR*/
diff --git a/lv_misc/lv_font.c b/lv_misc/lv_font.c
index 0053a8f562..40ae9553e0 100644
--- a/lv_misc/lv_font.c
+++ b/lv_misc/lv_font.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #include <stddef.h>
 #include "lv_font.h"
diff --git a/lv_misc/lv_font.h b/lv_misc/lv_font.h
index f486e69fab..364dcee2fe 100644
--- a/lv_misc/lv_font.h
+++ b/lv_misc/lv_font.h
@@ -14,7 +14,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #include <stdint.h>
 #include <stddef.h>
@@ -167,9 +167,9 @@ static inline uint8_t lv_font_get_width_scale(const lv_font_t * font_p, uint32_t
 #include "lv_fonts/symbol_80_file.h"
 #include "lv_fonts/symbol_80_feedback.h"
 
-#endif /*USE_FONT*/
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
 
+#endif /*USE_FONT*/
+
diff --git a/lv_misc/lv_fonts/dejavu_10.c b/lv_misc/lv_fonts/dejavu_10.c
index 3fbff71966..c1b07268ef 100644
--- a/lv_misc/lv_fonts/dejavu_10.c
+++ b/lv_misc/lv_fonts/dejavu_10.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_10 != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_10.h b/lv_misc/lv_fonts/dejavu_10.h
index 5696bf1ee7..4cc8a18aa8 100644
--- a/lv_misc/lv_fonts/dejavu_10.h
+++ b/lv_misc/lv_fonts/dejavu_10.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_10 != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_10_cyrillic.c b/lv_misc/lv_fonts/dejavu_10_cyrillic.c
index 568367d15a..26f0217ea1 100644
--- a/lv_misc/lv_fonts/dejavu_10_cyrillic.c
+++ b/lv_misc/lv_fonts/dejavu_10_cyrillic.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_10_CYRILLIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_10_cyrillic.h b/lv_misc/lv_fonts/dejavu_10_cyrillic.h
index ee1a2827d7..489c6b18dd 100644
--- a/lv_misc/lv_fonts/dejavu_10_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_10_cyrillic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_10_CYRILLIC != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c
index f114ce9177..5d4b75fe1c 100644
--- a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c
+++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h
index d997a40e78..2f3639605c 100644
--- a/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_a.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_10_LATIN_EXT_A != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c
index 973c9dcac5..34f50d4bdd 100644
--- a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c
+++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h
index 17930918d7..3d219b08c0 100644
--- a/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_10_latin_ext_b.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_10_LATIN_EXT_B != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_10_sup.c b/lv_misc/lv_fonts/dejavu_10_sup.c
index 3c537e9f3f..5d51c74bdd 100644
--- a/lv_misc/lv_fonts/dejavu_10_sup.c
+++ b/lv_misc/lv_fonts/dejavu_10_sup.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_10_SUP != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_10_sup.h b/lv_misc/lv_fonts/dejavu_10_sup.h
index 8de386473f..cb5e538ab0 100644
--- a/lv_misc/lv_fonts/dejavu_10_sup.h
+++ b/lv_misc/lv_fonts/dejavu_10_sup.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_10_SUP != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_20.c b/lv_misc/lv_fonts/dejavu_20.c
index f23a95a60a..934688c17a 100644
--- a/lv_misc/lv_fonts/dejavu_20.c
+++ b/lv_misc/lv_fonts/dejavu_20.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_20 != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_20.h b/lv_misc/lv_fonts/dejavu_20.h
index 6f68e17d6d..b6dfb467aa 100644
--- a/lv_misc/lv_fonts/dejavu_20.h
+++ b/lv_misc/lv_fonts/dejavu_20.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_20 != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_20_cyrillic.c b/lv_misc/lv_fonts/dejavu_20_cyrillic.c
index ec2c7e1b77..6480e87e9f 100644
--- a/lv_misc/lv_fonts/dejavu_20_cyrillic.c
+++ b/lv_misc/lv_fonts/dejavu_20_cyrillic.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_20_CYRILLIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_20_cyrillic.h b/lv_misc/lv_fonts/dejavu_20_cyrillic.h
index 057f7d0542..5489f58f0b 100644
--- a/lv_misc/lv_fonts/dejavu_20_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_20_cyrillic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_20_CYRILLIC != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c
index 30a7958faa..02f651b8b3 100644
--- a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c
+++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h
index bf96f02328..812e2e2c85 100644
--- a/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_a.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_20_LATIN_EXT_A != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c
index 23eafde565..45f8993ff4 100644
--- a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c
+++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h
index ad81da1e5a..c13280c1d8 100644
--- a/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_20_latin_ext_b.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_20_LATIN_EXT_B != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_20_sup.c b/lv_misc/lv_fonts/dejavu_20_sup.c
index 64321cce95..92dde92516 100644
--- a/lv_misc/lv_fonts/dejavu_20_sup.c
+++ b/lv_misc/lv_fonts/dejavu_20_sup.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_20_SUP != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_20_sup.h b/lv_misc/lv_fonts/dejavu_20_sup.h
index 045585a924..4471bb7f0a 100644
--- a/lv_misc/lv_fonts/dejavu_20_sup.h
+++ b/lv_misc/lv_fonts/dejavu_20_sup.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_20_SUP != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_30.c b/lv_misc/lv_fonts/dejavu_30.c
index db9be67f72..581d3524b6 100644
--- a/lv_misc/lv_fonts/dejavu_30.c
+++ b/lv_misc/lv_fonts/dejavu_30.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_30 != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_30.h b/lv_misc/lv_fonts/dejavu_30.h
index 4e1c23faaf..cc224f8310 100644
--- a/lv_misc/lv_fonts/dejavu_30.h
+++ b/lv_misc/lv_fonts/dejavu_30.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_30 != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_30_cyrillic.c b/lv_misc/lv_fonts/dejavu_30_cyrillic.c
index 2adb2217be..f4b7b262cf 100644
--- a/lv_misc/lv_fonts/dejavu_30_cyrillic.c
+++ b/lv_misc/lv_fonts/dejavu_30_cyrillic.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_30_CYRILLIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_30_cyrillic.h b/lv_misc/lv_fonts/dejavu_30_cyrillic.h
index 846e9f7777..3c49736c1a 100644
--- a/lv_misc/lv_fonts/dejavu_30_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_30_cyrillic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_30_CYRILLIC != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c
index 24cafcd051..57eeadb275 100644
--- a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c
+++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h
index 72b876ad10..2142855c05 100644
--- a/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_a.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_30_LATIN_EXT_A != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c
index 827f366a44..8dfd922ab2 100644
--- a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c
+++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h
index 502bd04388..13ccdd82c9 100644
--- a/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_30_latin_ext_b.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_30_LATIN_EXT_B != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_30_sup.c b/lv_misc/lv_fonts/dejavu_30_sup.c
index cfa363b56b..e8d9184e58 100644
--- a/lv_misc/lv_fonts/dejavu_30_sup.c
+++ b/lv_misc/lv_fonts/dejavu_30_sup.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_30_SUP != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_30_sup.h b/lv_misc/lv_fonts/dejavu_30_sup.h
index 3567bceebd..76493dd4f2 100644
--- a/lv_misc/lv_fonts/dejavu_30_sup.h
+++ b/lv_misc/lv_fonts/dejavu_30_sup.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_30_SUP != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_40.c b/lv_misc/lv_fonts/dejavu_40.c
index 563fb7ca88..45249c69a8 100644
--- a/lv_misc/lv_fonts/dejavu_40.c
+++ b/lv_misc/lv_fonts/dejavu_40.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_40 != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_40.h b/lv_misc/lv_fonts/dejavu_40.h
index 9d6c2375b6..f76a93d6b9 100644
--- a/lv_misc/lv_fonts/dejavu_40.h
+++ b/lv_misc/lv_fonts/dejavu_40.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_40 != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_40_cyrillic.c b/lv_misc/lv_fonts/dejavu_40_cyrillic.c
index 5e143e3f3b..a82b77b738 100644
--- a/lv_misc/lv_fonts/dejavu_40_cyrillic.c
+++ b/lv_misc/lv_fonts/dejavu_40_cyrillic.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_40_CYRILLIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_40_cyrillic.h b/lv_misc/lv_fonts/dejavu_40_cyrillic.h
index 5d4a578513..aa61aac667 100644
--- a/lv_misc/lv_fonts/dejavu_40_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_40_cyrillic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_40_CYRILLIC != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c
index 21cad0b71f..3b528e6abe 100644
--- a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c
+++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_40_LATIN_EXT_A != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h
index ea4d81174b..e8f42b5b7e 100644
--- a/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_a.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_40_LATIN_EXT_A != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c
index a3734f6d9e..43f5da94fc 100644
--- a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c
+++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_40_LATIN_EXT_B != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h
index 758cfb55f0..c436781ddb 100644
--- a/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_40_latin_ext_b.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_40_LATIN_EXT_B != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_40_sup.c b/lv_misc/lv_fonts/dejavu_40_sup.c
index 0e59b297a8..43539ee021 100644
--- a/lv_misc/lv_fonts/dejavu_40_sup.c
+++ b/lv_misc/lv_fonts/dejavu_40_sup.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_40_SUP != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_40_sup.h b/lv_misc/lv_fonts/dejavu_40_sup.h
index f2d676402b..bddadad511 100644
--- a/lv_misc/lv_fonts/dejavu_40_sup.h
+++ b/lv_misc/lv_fonts/dejavu_40_sup.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_40_SUP != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_60.c b/lv_misc/lv_fonts/dejavu_60.c
index 1ee45d8dfa..360e30ac58 100644
--- a/lv_misc/lv_fonts/dejavu_60.c
+++ b/lv_misc/lv_fonts/dejavu_60.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_60 != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_60.h b/lv_misc/lv_fonts/dejavu_60.h
index 3e28fadcbc..8b986634eb 100644
--- a/lv_misc/lv_fonts/dejavu_60.h
+++ b/lv_misc/lv_fonts/dejavu_60.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_60 != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_60_cyrillic.c b/lv_misc/lv_fonts/dejavu_60_cyrillic.c
index 8b7ca1f52d..d4fa6f074c 100644
--- a/lv_misc/lv_fonts/dejavu_60_cyrillic.c
+++ b/lv_misc/lv_fonts/dejavu_60_cyrillic.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_60_CYRILLIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_60_cyrillic.h b/lv_misc/lv_fonts/dejavu_60_cyrillic.h
index 16318aa5a5..abea651552 100644
--- a/lv_misc/lv_fonts/dejavu_60_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_60_cyrillic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_60_CYRILLIC != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c
index 3957717936..336714f1fc 100644
--- a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c
+++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_60_LATIN_EXT_A != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h
index 0408908d7d..29ebca7bde 100644
--- a/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_a.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_60_LATIN_EXT_A != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c
index f4379c27f6..eb8379e4f2 100644
--- a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c
+++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_60_LATIN_EXT_B != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h
index dea1b62cec..08acbad908 100644
--- a/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_60_latin_ext_b.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_60_LATIN_EXT_B != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_60_sup.c b/lv_misc/lv_fonts/dejavu_60_sup.c
index 13026ccf29..d5dd35b56c 100644
--- a/lv_misc/lv_fonts/dejavu_60_sup.c
+++ b/lv_misc/lv_fonts/dejavu_60_sup.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_60_SUP != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_60_sup.h b/lv_misc/lv_fonts/dejavu_60_sup.h
index 12927eec31..d631a7ed7c 100644
--- a/lv_misc/lv_fonts/dejavu_60_sup.h
+++ b/lv_misc/lv_fonts/dejavu_60_sup.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_60_SUP != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_80.c b/lv_misc/lv_fonts/dejavu_80.c
index f04add16f0..a73ad03237 100644
--- a/lv_misc/lv_fonts/dejavu_80.c
+++ b/lv_misc/lv_fonts/dejavu_80.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_80 != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_80.h b/lv_misc/lv_fonts/dejavu_80.h
index 8bf97df2b1..e8d805ef23 100644
--- a/lv_misc/lv_fonts/dejavu_80.h
+++ b/lv_misc/lv_fonts/dejavu_80.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_80 != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_80_cyrillic.c b/lv_misc/lv_fonts/dejavu_80_cyrillic.c
index 434b552c17..9b7e6e97d1 100644
--- a/lv_misc/lv_fonts/dejavu_80_cyrillic.c
+++ b/lv_misc/lv_fonts/dejavu_80_cyrillic.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_80_CYRILLIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_80_cyrillic.h b/lv_misc/lv_fonts/dejavu_80_cyrillic.h
index c6c78373dd..ddd7d8512b 100644
--- a/lv_misc/lv_fonts/dejavu_80_cyrillic.h
+++ b/lv_misc/lv_fonts/dejavu_80_cyrillic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_80_CYRILLIC != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c
index 1f763f4984..2c49aa162a 100644
--- a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c
+++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_80_LATIN_EXT_A != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h
index c17d55e059..889cb90b6e 100644
--- a/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h
+++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_a.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_80_LATIN_EXT_A != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c
index 9d65347ca9..1f4eec2ede 100644
--- a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c
+++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_80_LATIN_EXT_B != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h
index e0f78342e4..6dd3bf9980 100644
--- a/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h
+++ b/lv_misc/lv_fonts/dejavu_80_latin_ext_b.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_80_LATIN_EXT_B != 0
 
diff --git a/lv_misc/lv_fonts/dejavu_80_sup.c b/lv_misc/lv_fonts/dejavu_80_sup.c
index a09a933cfc..30b1e34855 100644
--- a/lv_misc/lv_fonts/dejavu_80_sup.c
+++ b/lv_misc/lv_fonts/dejavu_80_sup.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_DEJAVU_80_SUP != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/dejavu_80_sup.h b/lv_misc/lv_fonts/dejavu_80_sup.h
index 607cfb0e54..d440d204ed 100644
--- a/lv_misc/lv_fonts/dejavu_80_sup.h
+++ b/lv_misc/lv_fonts/dejavu_80_sup.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_DEJAVU_80_SUP != 0
 
diff --git a/lv_misc/lv_fonts/symbol_10_basic.c b/lv_misc/lv_fonts/symbol_10_basic.c
index 808f8c68ca..9b40298814 100644
--- a/lv_misc/lv_fonts/symbol_10_basic.c
+++ b/lv_misc/lv_fonts/symbol_10_basic.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_10_BASIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_10_basic.h b/lv_misc/lv_fonts/symbol_10_basic.h
index 2cf22703f4..96356c8c4e 100644
--- a/lv_misc/lv_fonts/symbol_10_basic.h
+++ b/lv_misc/lv_fonts/symbol_10_basic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_10_BASIC != 0
 
diff --git a/lv_misc/lv_fonts/symbol_10_feedback.c b/lv_misc/lv_fonts/symbol_10_feedback.c
index 07a24cca63..231274d229 100644
--- a/lv_misc/lv_fonts/symbol_10_feedback.c
+++ b/lv_misc/lv_fonts/symbol_10_feedback.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_10_FEEDBACK != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_10_feedback.h b/lv_misc/lv_fonts/symbol_10_feedback.h
index 7dee09c2a6..6154f70f60 100644
--- a/lv_misc/lv_fonts/symbol_10_feedback.h
+++ b/lv_misc/lv_fonts/symbol_10_feedback.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_10_FEEDBACK != 0
 
diff --git a/lv_misc/lv_fonts/symbol_10_file.c b/lv_misc/lv_fonts/symbol_10_file.c
index 73bca34fd1..9bed79d47b 100644
--- a/lv_misc/lv_fonts/symbol_10_file.c
+++ b/lv_misc/lv_fonts/symbol_10_file.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_10_FILE != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_10_file.h b/lv_misc/lv_fonts/symbol_10_file.h
index aa695551ea..42237ef83f 100644
--- a/lv_misc/lv_fonts/symbol_10_file.h
+++ b/lv_misc/lv_fonts/symbol_10_file.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_10_FILE != 0
 
diff --git a/lv_misc/lv_fonts/symbol_20_basic.c b/lv_misc/lv_fonts/symbol_20_basic.c
index dd5c1c38fb..27b371d37a 100644
--- a/lv_misc/lv_fonts/symbol_20_basic.c
+++ b/lv_misc/lv_fonts/symbol_20_basic.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_20_BASIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_20_basic.h b/lv_misc/lv_fonts/symbol_20_basic.h
index 66ff0d1d0f..b97eb3ab58 100644
--- a/lv_misc/lv_fonts/symbol_20_basic.h
+++ b/lv_misc/lv_fonts/symbol_20_basic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_20_BASIC != 0
 
diff --git a/lv_misc/lv_fonts/symbol_20_feedback.c b/lv_misc/lv_fonts/symbol_20_feedback.c
index fbebc0ebc1..3f46e4d5e9 100644
--- a/lv_misc/lv_fonts/symbol_20_feedback.c
+++ b/lv_misc/lv_fonts/symbol_20_feedback.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_20_FEEDBACK != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_20_feedback.h b/lv_misc/lv_fonts/symbol_20_feedback.h
index 7ce7269210..5475dab60e 100644
--- a/lv_misc/lv_fonts/symbol_20_feedback.h
+++ b/lv_misc/lv_fonts/symbol_20_feedback.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_20_FEEDBACK != 0
 
diff --git a/lv_misc/lv_fonts/symbol_20_file.c b/lv_misc/lv_fonts/symbol_20_file.c
index f97fa55d3f..d01a654033 100644
--- a/lv_misc/lv_fonts/symbol_20_file.c
+++ b/lv_misc/lv_fonts/symbol_20_file.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_20_FILE != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_20_file.h b/lv_misc/lv_fonts/symbol_20_file.h
index 5ab4ff1cae..190ceb45c6 100644
--- a/lv_misc/lv_fonts/symbol_20_file.h
+++ b/lv_misc/lv_fonts/symbol_20_file.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_20_FILE != 0
 
diff --git a/lv_misc/lv_fonts/symbol_30_basic.c b/lv_misc/lv_fonts/symbol_30_basic.c
index f77dd8629b..d97a47debd 100644
--- a/lv_misc/lv_fonts/symbol_30_basic.c
+++ b/lv_misc/lv_fonts/symbol_30_basic.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_30_BASIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_30_basic.h b/lv_misc/lv_fonts/symbol_30_basic.h
index d66927b90a..38d4af320c 100644
--- a/lv_misc/lv_fonts/symbol_30_basic.h
+++ b/lv_misc/lv_fonts/symbol_30_basic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_30_BASIC != 0
 
diff --git a/lv_misc/lv_fonts/symbol_30_feedback.c b/lv_misc/lv_fonts/symbol_30_feedback.c
index 0efa7169cd..b0aa040b94 100644
--- a/lv_misc/lv_fonts/symbol_30_feedback.c
+++ b/lv_misc/lv_fonts/symbol_30_feedback.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_30_FEEDBACK != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_30_feedback.h b/lv_misc/lv_fonts/symbol_30_feedback.h
index d5374962b4..8ad3999a90 100644
--- a/lv_misc/lv_fonts/symbol_30_feedback.h
+++ b/lv_misc/lv_fonts/symbol_30_feedback.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_30_FEEDBACK != 0
 
diff --git a/lv_misc/lv_fonts/symbol_30_file.c b/lv_misc/lv_fonts/symbol_30_file.c
index c4d7d331b5..5569958fb6 100644
--- a/lv_misc/lv_fonts/symbol_30_file.c
+++ b/lv_misc/lv_fonts/symbol_30_file.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_30_FILE != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_30_file.h b/lv_misc/lv_fonts/symbol_30_file.h
index de1c0a92f6..42755817cd 100644
--- a/lv_misc/lv_fonts/symbol_30_file.h
+++ b/lv_misc/lv_fonts/symbol_30_file.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_30_FILE != 0
 
diff --git a/lv_misc/lv_fonts/symbol_40_basic.c b/lv_misc/lv_fonts/symbol_40_basic.c
index 61bf5cec3f..6355e9127c 100644
--- a/lv_misc/lv_fonts/symbol_40_basic.c
+++ b/lv_misc/lv_fonts/symbol_40_basic.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_40_BASIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_40_basic.h b/lv_misc/lv_fonts/symbol_40_basic.h
index 4a9f2fb2ff..733a1fc93e 100644
--- a/lv_misc/lv_fonts/symbol_40_basic.h
+++ b/lv_misc/lv_fonts/symbol_40_basic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_40_BASIC != 0
 
diff --git a/lv_misc/lv_fonts/symbol_40_feedback.c b/lv_misc/lv_fonts/symbol_40_feedback.c
index d615a1888b..ce546f8e02 100644
--- a/lv_misc/lv_fonts/symbol_40_feedback.c
+++ b/lv_misc/lv_fonts/symbol_40_feedback.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_40_FEEDBACK != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_40_feedback.h b/lv_misc/lv_fonts/symbol_40_feedback.h
index a416842678..40d887bda6 100644
--- a/lv_misc/lv_fonts/symbol_40_feedback.h
+++ b/lv_misc/lv_fonts/symbol_40_feedback.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_40_FEEDBACK != 0
 
diff --git a/lv_misc/lv_fonts/symbol_40_file.c b/lv_misc/lv_fonts/symbol_40_file.c
index 23acefd7a7..d80aaca0ae 100644
--- a/lv_misc/lv_fonts/symbol_40_file.c
+++ b/lv_misc/lv_fonts/symbol_40_file.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_40_FILE != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_40_file.h b/lv_misc/lv_fonts/symbol_40_file.h
index 36f6d130c2..438365725a 100644
--- a/lv_misc/lv_fonts/symbol_40_file.h
+++ b/lv_misc/lv_fonts/symbol_40_file.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_40_FILE != 0
 
diff --git a/lv_misc/lv_fonts/symbol_60_basic.c b/lv_misc/lv_fonts/symbol_60_basic.c
index 98bdbba2d5..93d38544ea 100644
--- a/lv_misc/lv_fonts/symbol_60_basic.c
+++ b/lv_misc/lv_fonts/symbol_60_basic.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_60_BASIC != 0
 #include <stdint.h>
diff --git a/lv_misc/lv_fonts/symbol_60_basic.h b/lv_misc/lv_fonts/symbol_60_basic.h
index 0cd155742f..3354c560e5 100644
--- a/lv_misc/lv_fonts/symbol_60_basic.h
+++ b/lv_misc/lv_fonts/symbol_60_basic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_60_BASIC != 0
 
diff --git a/lv_misc/lv_fonts/symbol_60_feedback.c b/lv_misc/lv_fonts/symbol_60_feedback.c
index b40261c32b..698417056e 100644
--- a/lv_misc/lv_fonts/symbol_60_feedback.c
+++ b/lv_misc/lv_fonts/symbol_60_feedback.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_60_FEEDBACK != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_60_feedback.h b/lv_misc/lv_fonts/symbol_60_feedback.h
index 3c8c8ea0ff..351238fc98 100644
--- a/lv_misc/lv_fonts/symbol_60_feedback.h
+++ b/lv_misc/lv_fonts/symbol_60_feedback.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_60_FEEDBACK != 0
 
diff --git a/lv_misc/lv_fonts/symbol_60_file.c b/lv_misc/lv_fonts/symbol_60_file.c
index 5083bfbe16..144b13b16e 100644
--- a/lv_misc/lv_fonts/symbol_60_file.c
+++ b/lv_misc/lv_fonts/symbol_60_file.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_60_FILE != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_60_file.h b/lv_misc/lv_fonts/symbol_60_file.h
index b20609d6bd..cbf5ed2368 100644
--- a/lv_misc/lv_fonts/symbol_60_file.h
+++ b/lv_misc/lv_fonts/symbol_60_file.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_60_FILE != 0
 
diff --git a/lv_misc/lv_fonts/symbol_80_basic.c b/lv_misc/lv_fonts/symbol_80_basic.c
index f84c9dfc0a..6da363e940 100644
--- a/lv_misc/lv_fonts/symbol_80_basic.c
+++ b/lv_misc/lv_fonts/symbol_80_basic.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_80_BASIC != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_80_basic.h b/lv_misc/lv_fonts/symbol_80_basic.h
index cdb10f605e..b34076ac05 100644
--- a/lv_misc/lv_fonts/symbol_80_basic.h
+++ b/lv_misc/lv_fonts/symbol_80_basic.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_80_BASIC != 0
 
diff --git a/lv_misc/lv_fonts/symbol_80_feedback.c b/lv_misc/lv_fonts/symbol_80_feedback.c
index 7cf07391e4..2ad69fc900 100644
--- a/lv_misc/lv_fonts/symbol_80_feedback.c
+++ b/lv_misc/lv_fonts/symbol_80_feedback.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_80_FEEDBACK != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_80_feedback.h b/lv_misc/lv_fonts/symbol_80_feedback.h
index a4fee17df0..6ae91fda35 100644
--- a/lv_misc/lv_fonts/symbol_80_feedback.h
+++ b/lv_misc/lv_fonts/symbol_80_feedback.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_80_FEEDBACK != 0
 
diff --git a/lv_misc/lv_fonts/symbol_80_file.c b/lv_misc/lv_fonts/symbol_80_file.c
index ee3b1a793c..88619c0dd7 100644
--- a/lv_misc/lv_fonts/symbol_80_file.c
+++ b/lv_misc/lv_fonts/symbol_80_file.c
@@ -1,4 +1,4 @@
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 #if  USE_LV_FONT_SYMBOL_80_FILE != 0
 #include <stdint.h>
 #include "../lv_font.h"
diff --git a/lv_misc/lv_fonts/symbol_80_file.h b/lv_misc/lv_fonts/symbol_80_file.h
index 82f31e2e9d..63f8df8c8e 100644
--- a/lv_misc/lv_fonts/symbol_80_file.h
+++ b/lv_misc/lv_fonts/symbol_80_file.h
@@ -3,7 +3,7 @@
 
 /*Use UTF-8 encoding in the IDE*/
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 #if  USE_LV_FONT_SYMBOL_80_FILE != 0
 
diff --git a/lv_misc/lv_fonts/symbol_def.h b/lv_misc/lv_fonts/symbol_def.h
index 0e00f02182..9f98ff1522 100644
--- a/lv_misc/lv_fonts/symbol_def.h
+++ b/lv_misc/lv_fonts/symbol_def.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#include "lv_conf.h"
+#include "../../../lv_conf.h"
 
 /*
  * With no UTF-8 support (192-255)
diff --git a/lv_misc/lv_mem.c b/lv_misc/lv_mem.c
index 161290fee7..9c7dedc226 100644
--- a/lv_misc/lv_mem.c
+++ b/lv_misc/lv_mem.c
@@ -7,7 +7,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #include "lv_mem.h"
 #include "lv_math.h"
 #include <string.h>
diff --git a/lv_misc/lv_mem.h b/lv_misc/lv_mem.h
index 6c16e8d6a0..333a43813f 100644
--- a/lv_misc/lv_mem.h
+++ b/lv_misc/lv_mem.h
@@ -102,8 +102,6 @@ static inline  void lv_mem_assert(void *p)
  *      MACROS
  **********************/
 
-
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/lv_misc/lv_task.h b/lv_misc/lv_task.h
index 4f5a259d73..a231d9e98a 100644
--- a/lv_misc/lv_task.h
+++ b/lv_misc/lv_task.h
@@ -131,5 +131,4 @@ void lv_task_enable(bool en);
 } /* extern "C" */
 #endif
 
-
 #endif 
diff --git a/lv_misc/lv_txt.c b/lv_misc/lv_txt.c
index 1e6ac44bff..7b65e9fb12 100644
--- a/lv_misc/lv_txt.c
+++ b/lv_misc/lv_txt.c
@@ -7,7 +7,7 @@
  *      INCLUDES
  *********************/
 #include "lv_txt.h"
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #include "lv_math.h"
 
 /*********************
@@ -338,7 +338,8 @@ uint32_t txt_unicode_to_utf8(uint32_t letter_uni)
         bytes[3] = ((letter_uni>>0)  & 0x3F) | 0x80;
     }
 
-    return *((uint32_t *) bytes);
+    uint32_t *res_p = (uint32_t *)bytes;
+    return *res_p;
 }
 
 /**
@@ -380,7 +381,7 @@ uint32_t lv_txt_utf8_next(const char * txt, uint32_t * i)
     else {
         /*2 bytes UTF-8 code*/
         if((txt[*i] & 0b11100000) == 0b11000000) {
-            result = (txt[*i] & 0b00011111) << 6;
+            result = (uint32_t)(txt[*i] & 0b00011111) << 6;
             (*i)++;
             if((txt[*i] & 0b11000000) != 0b10000000) return 0;  /*Invalid UTF-8 code*/
             result += (txt[*i] & 0b00111111);
@@ -388,11 +389,11 @@ uint32_t lv_txt_utf8_next(const char * txt, uint32_t * i)
         }
         /*3 bytes UTF-8 code*/
         else if((txt[*i] & 0b11110000) == 0b11100000) {
-            result = (txt[*i] & 0b00001111) << 12;
+            result = (uint32_t)(txt[*i] & 0b00001111) << 12;
             (*i)++;
 
             if((txt[*i] & 0b11000000) != 0b10000000) return 0;  /*Invalid UTF-8 code*/
-            result += (txt[*i] & 0b00111111) << 6;
+            result += (uint32_t)(txt[*i] & 0b00111111) << 6;
             (*i)++;
 
             if((txt[*i] & 0b11000000) != 0b10000000) return 0;  /*Invalid UTF-8 code*/
@@ -401,19 +402,19 @@ uint32_t lv_txt_utf8_next(const char * txt, uint32_t * i)
         }
         /*3 bytes UTF-8 code*/
         else if((txt[*i] & 0b11111000) == 0b11110000) {
-            result = (txt[*i] & 0b00001111) << 18;
+            result = (uint32_t)(txt[*i] & 0b00001111) << 18;
             (*i)++;
 
             if((txt[*i] & 0b11000000) != 0b10000000) return 0;  /*Invalid UTF-8 code*/
-            result += (txt[*i] & 0b00111111) << 12;
+            result += (uint32_t)(txt[*i] & 0b00111111) << 12;
             (*i)++;
 
             if((txt[*i] & 0b11000000) != 0b10000000) return 0;  /*Invalid UTF-8 code*/
-            result += (txt[*i] & 0b00111111) << 6;
+            result += (uint32_t)(txt[*i] & 0b00111111) << 6;
             (*i)++;
 
             if((txt[*i] & 0b11000000) != 0b10000000) return 0;  /*Invalid UTF-8 code*/
-            result += (txt[*i] & 0b00111111) << 6;
+            result += (uint32_t)(txt[*i] & 0b00111111) << 6;
             (*i)++;
         } else {
             (*i)++; /*Not UTF-8 char. Go the next.*/
diff --git a/lv_misc/lv_txt.h b/lv_misc/lv_txt.h
index e38ebcd634..6f1e2a16b4 100644
--- a/lv_misc/lv_txt.h
+++ b/lv_misc/lv_txt.h
@@ -171,8 +171,8 @@ uint32_t lv_txt_get_length(const char * txt);
  *      MACROS
  **********************/
 
-#endif /*USE_TEXT*/
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
+
+#endif /*USE_TXT*/
diff --git a/lv_misc/lv_ufs.c b/lv_misc/lv_ufs.c
index b4bd28cc6b..9759508b98 100644
--- a/lv_misc/lv_ufs.c
+++ b/lv_misc/lv_ufs.c
@@ -7,7 +7,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #include "lv_ufs.h"
 #include "lv_ll.h"
 #include <string.h>
diff --git a/lv_misc/lv_ufs.h b/lv_misc/lv_ufs.h
index d5167cea8e..eec2f4f7e9 100644
--- a/lv_misc/lv_ufs.h
+++ b/lv_misc/lv_ufs.h
@@ -201,5 +201,4 @@ lv_fs_res_t lv_ufs_free (uint32_t * total_p, uint32_t * free_p);
 } /* extern "C" */
 #endif
 
-
 #endif
diff --git a/lv_obj/lv_group.h b/lv_obj/lv_group.h
index adc777d110..146738db0c 100644
--- a/lv_obj/lv_group.h
+++ b/lv_obj/lv_group.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #include "lv_obj.h"
 
 /*********************
diff --git a/lv_obj/lv_indev.c b/lv_obj/lv_indev.c
index 73938a313e..a251f58589 100644
--- a/lv_obj/lv_indev.c
+++ b/lv_obj/lv_indev.c
@@ -6,8 +6,8 @@
 /*********************
  *      INCLUDES
  ********************/
-#include <lvgl/lv_obj/lv_indev.h>
-#include "lv_conf.h"
+#include "lv_indev.h"
+#include "../../lv_conf.h"
 
 #include "../lv_hal/lv_hal_tick.h"
 #include "../lv_obj/lv_group.h"
diff --git a/lv_obj/lv_obj.c b/lv_obj/lv_obj.c
index 6a980c85c8..2094e5d0f5 100644
--- a/lv_obj/lv_obj.c
+++ b/lv_obj/lv_obj.c
@@ -6,8 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-
-#include "lv_conf.h"
 #include "lv_obj.h"
 #include "lv_indev.h"
 #include "lv_refr.h"
diff --git a/lv_obj/lv_obj.h b/lv_obj/lv_obj.h
index 700bddf95b..b58f28dc34 100644
--- a/lv_obj/lv_obj.h
+++ b/lv_obj/lv_obj.h
@@ -13,14 +13,14 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #include <stddef.h>
 #include <stdbool.h>
+#include "lv_style.h"
 #include "../lv_misc/lv_area.h"
 #include "../lv_misc/lv_mem.h"
 #include "../lv_misc/lv_ll.h"
 #include "../lv_misc/lv_color.h"
-#include "lv_style.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_obj/lv_refr.c b/lv_obj/lv_refr.c
index 0d58a9b541..582e685bdf 100644
--- a/lv_obj/lv_refr.c
+++ b/lv_obj/lv_refr.c
@@ -6,11 +6,11 @@
 /*********************
  *      INCLUDES
  *********************/
-#include <lvgl/lv_hal/lv_hal_tick.h>
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #include <stddef.h>
 #include "lv_refr.h"
 #include "lv_vdb.h"
+#include "../lv_hal/lv_hal_tick.h"
 #include "../lv_misc/lv_task.h"
 #include "../lv_misc/lv_mem.h"
 
diff --git a/lv_obj/lv_style.c b/lv_obj/lv_style.c
index 6a2cf02445..0e67e902b4 100644
--- a/lv_obj/lv_style.c
+++ b/lv_obj/lv_style.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #include "lv_style.h"
 #include "lv_obj.h"
 #include "../lv_misc/lv_mem.h"
diff --git a/lv_obj/lv_vdb.c b/lv_obj/lv_vdb.c
index 71e55ad368..ae03b9a4d5 100644
--- a/lv_obj/lv_vdb.c
+++ b/lv_obj/lv_vdb.c
@@ -2,7 +2,7 @@
  * @file lv_vdb.c
  * 
  */
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if LV_VDB_SIZE != 0
 
 #include "../lv_hal/lv_hal_disp.h"
diff --git a/lv_obj/lv_vdb.h b/lv_obj/lv_vdb.h
index 9f7461e1d8..ac90fa43eb 100644
--- a/lv_obj/lv_vdb.h
+++ b/lv_obj/lv_vdb.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #if LV_VDB_SIZE != 0
 
diff --git a/lv_objx/lv_bar.c b/lv_objx/lv_bar.c
index bf102df371..50b94c192f 100644
--- a/lv_objx/lv_bar.c
+++ b/lv_objx/lv_bar.c
@@ -8,7 +8,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_BAR != 0
 
 #include "lv_bar.h"
diff --git a/lv_objx/lv_bar.h b/lv_objx/lv_bar.h
index 641f2c70cc..3ed6b41e9a 100644
--- a/lv_objx/lv_bar.h
+++ b/lv_objx/lv_bar.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_BAR != 0
 
 #include "../lv_obj/lv_obj.h"
diff --git a/lv_objx/lv_btn.c b/lv_objx/lv_btn.c
index 0f74b88bc2..0b8473a87c 100644
--- a/lv_objx/lv_btn.c
+++ b/lv_objx/lv_btn.c
@@ -7,7 +7,7 @@
  *      INCLUDES
  *********************/
 
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_BTN != 0
 
 #include <string.h>
diff --git a/lv_objx/lv_btn.h b/lv_objx/lv_btn.h
index 24493b71db..0560546ab5 100644
--- a/lv_objx/lv_btn.h
+++ b/lv_objx/lv_btn.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_BTN != 0
 
 /*Testing of dependencies*/
@@ -220,4 +220,4 @@ lv_style_t * lv_btn_get_style(lv_obj_t * btn, lv_btn_style_t type);
 } /* extern "C" */
 #endif
 
-#endif  /*lv_btn_H*/
+#endif  /*LV_BTN_H*/
diff --git a/lv_objx/lv_btnm.c b/lv_objx/lv_btnm.c
index 2af03d55be..e6f6dc0acc 100644
--- a/lv_objx/lv_btnm.c
+++ b/lv_objx/lv_btnm.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_BTNM != 0
 
 #include "lv_btnm.h"
@@ -14,7 +14,7 @@
 #include "../lv_draw/lv_draw.h"
 #include "../lv_obj/lv_refr.h"
 #include "../lv_themes/lv_theme.h"
-#include <lvgl/lv_misc/lv_txt.h>
+#include "../lv_misc/lv_txt.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_btnm.h b/lv_objx/lv_btnm.h
index f975a9e684..b13ccb27e1 100644
--- a/lv_objx/lv_btnm.h
+++ b/lv_objx/lv_btnm.h
@@ -14,7 +14,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_BTNM != 0
 
 #include "../lv_obj/lv_obj.h"
diff --git a/lv_objx/lv_cb.c b/lv_objx/lv_cb.c
index ef64835414..6ac9bd855d 100644
--- a/lv_objx/lv_cb.c
+++ b/lv_objx/lv_cb.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_CB != 0
 
 #include "lv_cb.h"
diff --git a/lv_objx/lv_cb.h b/lv_objx/lv_cb.h
index 11f3ef0c5a..1036875ae9 100644
--- a/lv_objx/lv_cb.h
+++ b/lv_objx/lv_cb.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_CB != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_chart.c b/lv_objx/lv_chart.c
index 67b3d8cd6f..0f3a7f5637 100644
--- a/lv_objx/lv_chart.c
+++ b/lv_objx/lv_chart.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_CHART != 0
 
 #include "lv_chart.h"
diff --git a/lv_objx/lv_chart.h b/lv_objx/lv_chart.h
index e9792da297..d97cac5f73 100644
--- a/lv_objx/lv_chart.h
+++ b/lv_objx/lv_chart.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_CHART != 0
 
 #include "../lv_obj/lv_obj.h"
diff --git a/lv_objx/lv_cont.c b/lv_objx/lv_cont.c
index 267cb2c03e..45d9946bb1 100644
--- a/lv_objx/lv_cont.c
+++ b/lv_objx/lv_cont.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #if USE_LV_CONT != 0
 
diff --git a/lv_objx/lv_cont.h b/lv_objx/lv_cont.h
index 66ca503be1..1171f33812 100644
--- a/lv_objx/lv_cont.h
+++ b/lv_objx/lv_cont.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_CONT != 0
 
 #include "../lv_obj/lv_obj.h"
diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c
index 63a07f4cc9..93545aff36 100644
--- a/lv_objx/lv_ddlist.c
+++ b/lv_objx/lv_ddlist.c
@@ -7,7 +7,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_DDLIST != 0
 
 #include "lv_ddlist.h"
diff --git a/lv_objx/lv_ddlist.h b/lv_objx/lv_ddlist.h
index cdc0ace3b1..22781d6acc 100644
--- a/lv_objx/lv_ddlist.h
+++ b/lv_objx/lv_ddlist.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_DDLIST != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_gauge.c b/lv_objx/lv_gauge.c
index ed0659e1a3..b69d5a0bba 100644
--- a/lv_objx/lv_gauge.c
+++ b/lv_objx/lv_gauge.c
@@ -7,7 +7,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_GAUGE != 0
 
 #include "lv_gauge.h"
diff --git a/lv_objx/lv_gauge.h b/lv_objx/lv_gauge.h
index ae845697ac..895e223920 100644
--- a/lv_objx/lv_gauge.h
+++ b/lv_objx/lv_gauge.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_GAUGE != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_img.c b/lv_objx/lv_img.c
index 7e8c141cf4..4f73c19fff 100644
--- a/lv_objx/lv_img.c
+++ b/lv_objx/lv_img.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_IMG != 0
 
 #include "lv_img.h"
diff --git a/lv_objx/lv_img.h b/lv_objx/lv_img.h
index a265749d8d..b3191be065 100644
--- a/lv_objx/lv_img.h
+++ b/lv_objx/lv_img.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_IMG != 0
 
 #include "../lv_obj/lv_obj.h"
diff --git a/lv_objx/lv_kb.c b/lv_objx/lv_kb.c
index 2eeb49a60d..bd3d19ab2b 100644
--- a/lv_objx/lv_kb.c
+++ b/lv_objx/lv_kb.c
@@ -7,7 +7,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_KB != 0
 
 #include "lv_kb.h"
diff --git a/lv_objx/lv_kb.h b/lv_objx/lv_kb.h
index 202df500fd..a159e3b969 100644
--- a/lv_objx/lv_kb.h
+++ b/lv_objx/lv_kb.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_KB != 0
 
 #include "../lv_obj/lv_obj.h"
diff --git a/lv_objx/lv_label.c b/lv_objx/lv_label.c
index 1c2e218bb1..262b6deaf2 100644
--- a/lv_objx/lv_label.c
+++ b/lv_objx/lv_label.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_LABEL != 0
 
 #include "lv_label.h"
@@ -14,10 +14,7 @@
 #include "../lv_obj/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_misc/lv_color.h"
-#include <lvgl/lv_misc/lv_txt.h>
 #include "../lv_misc/lv_math.h"
-#include <lvgl/lv_misc/lv_txt.h>
-#include "../lv_misc/lv_anim.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_label.h b/lv_objx/lv_label.h
index 5c43d9d4e7..8e59479c24 100644
--- a/lv_objx/lv_label.h
+++ b/lv_objx/lv_label.h
@@ -13,12 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_LABEL != 0
 
 #include "../lv_obj/lv_obj.h"
 #include "../lv_misc/lv_font.h"
-#include <lvgl/lv_misc/lv_txt.h>
+#include "../lv_misc/lv_txt.h"
 #include "../lv_misc/lv_fonts/symbol_def.h"
 
 /*********************
diff --git a/lv_objx/lv_led.c b/lv_objx/lv_led.c
index 15e90509c0..6d94a54dca 100644
--- a/lv_objx/lv_led.c
+++ b/lv_objx/lv_led.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_LED != 0
 
 #include "lv_led.h"
diff --git a/lv_objx/lv_led.h b/lv_objx/lv_led.h
index 4a8eb5cda6..7fd6e64828 100644
--- a/lv_objx/lv_led.h
+++ b/lv_objx/lv_led.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_LED != 0
 
 #include "../lv_obj/lv_obj.h"
diff --git a/lv_objx/lv_line.c b/lv_objx/lv_line.c
index 5988b0d435..00178fddb5 100644
--- a/lv_objx/lv_line.c
+++ b/lv_objx/lv_line.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #if USE_LV_LINE != 0
 #include "lv_line.h"
diff --git a/lv_objx/lv_line.h b/lv_objx/lv_line.h
index c797633f68..bc6f9c66ce 100644
--- a/lv_objx/lv_line.h
+++ b/lv_objx/lv_line.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_LINE != 0
 
 #include "../lv_obj/lv_obj.h"
diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c
index f7a0ced0d8..ea6d404e85 100644
--- a/lv_objx/lv_list.c
+++ b/lv_objx/lv_list.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_LIST != 0
 
 #include "lv_list.h"
@@ -162,7 +162,7 @@ lv_obj_t * lv_list_add(lv_obj_t * list, const char * img_fn, const char * txt, l
     w -= pad_hor_tot * 2;
 
     lv_obj_set_width(liste, w);
-#if USE_LV_IMG != 0 && USE_FSINT != 0
+#if USE_LV_IMG != 0
 	if(img_fn != NULL && img_fn[0] != '\0') {
 		lv_obj_t * img = lv_img_create(liste, NULL);
 		lv_img_set_file(img, img_fn);
@@ -297,7 +297,7 @@ lv_obj_t * lv_list_get_btn_label(lv_obj_t * btn)
  */
 lv_obj_t * lv_list_get_btn_img(lv_obj_t * btn)
 {
-#if USE_LV_IMG != 0 && USE_FSINT != 0
+#if USE_LV_IMG != 0
     lv_obj_t * img = lv_obj_get_child(btn, NULL);
     if(img == NULL) return NULL;
 
diff --git a/lv_objx/lv_list.h b/lv_objx/lv_list.h
index 93f2e8125c..7725c5508f 100644
--- a/lv_objx/lv_list.h
+++ b/lv_objx/lv_list.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_LIST != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_lmeter.c b/lv_objx/lv_lmeter.c
index 819c37e496..352fbb9488 100644
--- a/lv_objx/lv_lmeter.c
+++ b/lv_objx/lv_lmeter.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_LMETER != 0
 
 #include "lv_lmeter.h"
diff --git a/lv_objx/lv_lmeter.h b/lv_objx/lv_lmeter.h
index 52daad1435..fb09f940ef 100644
--- a/lv_objx/lv_lmeter.h
+++ b/lv_objx/lv_lmeter.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_LMETER != 0
 
 #include "../lv_obj/lv_obj.h"
diff --git a/lv_objx/lv_mbox.c b/lv_objx/lv_mbox.c
index bd30cf5b15..8080c75dbf 100644
--- a/lv_objx/lv_mbox.c
+++ b/lv_objx/lv_mbox.c
@@ -7,7 +7,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_MBOX != 0
 
 #include "lv_mbox.h"
diff --git a/lv_objx/lv_mbox.h b/lv_objx/lv_mbox.h
index 71b8b311b7..37e8693578 100644
--- a/lv_objx/lv_mbox.h
+++ b/lv_objx/lv_mbox.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_MBOX != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_objx_templ.c b/lv_objx/lv_objx_templ.c
index 2c7f8ad675..25e316aac3 100644
--- a/lv_objx/lv_objx_templ.c
+++ b/lv_objx/lv_objx_templ.c
@@ -13,7 +13,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_TEMPL != 0
 
 #include "lv_templ.h"
diff --git a/lv_objx/lv_objx_templ.h b/lv_objx/lv_objx_templ.h
index 174dc4fcb5..3f02ed7672 100644
--- a/lv_objx/lv_objx_templ.h
+++ b/lv_objx/lv_objx_templ.h
@@ -21,7 +21,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_TEMPL != 0
 
 #include "../lv_obj/lv_obj.h"
diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c
index 3a84f17d05..419b7b95e8 100644
--- a/lv_objx/lv_page.c
+++ b/lv_objx/lv_page.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_PAGE != 0
 
 #include "../lv_obj/lv_group.h"
diff --git a/lv_objx/lv_page.h b/lv_objx/lv_page.h
index bd453ab1b0..e105043ffb 100644
--- a/lv_objx/lv_page.h
+++ b/lv_objx/lv_page.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_PAGE != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_roller.c b/lv_objx/lv_roller.c
index 5b5311f6bf..68e70bf671 100644
--- a/lv_objx/lv_roller.c
+++ b/lv_objx/lv_roller.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_ROLLER != 0
 
 #include "lv_roller.h"
diff --git a/lv_objx/lv_roller.h b/lv_objx/lv_roller.h
index 1c7e41a1ce..9a17fe583c 100644
--- a/lv_objx/lv_roller.h
+++ b/lv_objx/lv_roller.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_ROLLER != 0
 
 #include "../lv_obj/lv_obj.h"
diff --git a/lv_objx/lv_slider.c b/lv_objx/lv_slider.c
index 9764537d9e..1e11221766 100644
--- a/lv_objx/lv_slider.c
+++ b/lv_objx/lv_slider.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_SLIDER != 0
 
 #include "lv_slider.h"
diff --git a/lv_objx/lv_slider.h b/lv_objx/lv_slider.h
index a879d9ed31..7990b6c8d7 100644
--- a/lv_objx/lv_slider.h
+++ b/lv_objx/lv_slider.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_SLIDER != 0
 
 #include "../lv_obj/lv_obj.h"
diff --git a/lv_objx/lv_sw.c b/lv_objx/lv_sw.c
index e7ac05f552..a67987f6f5 100644
--- a/lv_objx/lv_sw.c
+++ b/lv_objx/lv_sw.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_SW != 0
 
 #include "lv_sw.h"
diff --git a/lv_objx/lv_sw.h b/lv_objx/lv_sw.h
index 1a16fb20b7..b7a4a53c2d 100644
--- a/lv_objx/lv_sw.h
+++ b/lv_objx/lv_sw.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_SW != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c
index 057ecf894e..31e78442e0 100644
--- a/lv_objx/lv_ta.c
+++ b/lv_objx/lv_ta.c
@@ -7,7 +7,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_TA != 0
 
 #include "lv_ta.h"
@@ -15,7 +15,7 @@
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
-#include <lvgl/lv_misc/lv_txt.h>
+#include "../lv_misc/lv_txt.h"
 #include "../lv_misc/lv_math.h"
 
 /*********************
diff --git a/lv_objx/lv_ta.h b/lv_objx/lv_ta.h
index 144563d0f2..d8d217f757 100644
--- a/lv_objx/lv_ta.h
+++ b/lv_objx/lv_ta.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_TA != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_tabview.c b/lv_objx/lv_tabview.c
index dffd2db1cd..70b110d889 100644
--- a/lv_objx/lv_tabview.c
+++ b/lv_objx/lv_tabview.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_TABVIEW != 0
 
 #include "lv_tabview.h"
diff --git a/lv_objx/lv_tabview.h b/lv_objx/lv_tabview.h
index 4c78f54c82..d6e1729f97 100644
--- a/lv_objx/lv_tabview.h
+++ b/lv_objx/lv_tabview.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_TABVIEW != 0
 
 
@@ -203,4 +203,4 @@ lv_style_t * lv_tabview_get_style(lv_obj_t *tabview, lv_tabview_style_t type);
 } /* extern "C" */
 #endif
 
-#endif  /*LV_TAB_H*/
+#endif  /*LV_TABVIEW_H*/
diff --git a/lv_objx/lv_win.c b/lv_objx/lv_win.c
index f12e8362a4..d751a44bbc 100644
--- a/lv_objx/lv_win.c
+++ b/lv_objx/lv_win.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_WIN != 0
 
 #include "lv_win.h"
diff --git a/lv_objx/lv_win.h b/lv_objx/lv_win.h
index 5cfa36342f..e81ce1638c 100644
--- a/lv_objx/lv_win.h
+++ b/lv_objx/lv_win.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 #if USE_LV_WIN != 0
 
 /*Testing of dependencies*/
diff --git a/lv_themes/lv_theme.c b/lv_themes/lv_theme.c
index 5089ef6324..b624d78442 100644
--- a/lv_themes/lv_theme.c
+++ b/lv_themes/lv_theme.c
@@ -6,7 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lvgl/lvgl.h"
 #include "lv_theme.h"
 
 /*********************
diff --git a/lv_themes/lv_theme.h b/lv_themes/lv_theme.h
index 7f18630478..2f995dd2de 100644
--- a/lv_themes/lv_theme.h
+++ b/lv_themes/lv_theme.h
@@ -13,8 +13,8 @@ extern "C" {
 /*********************
  *    INCLUDES
  *********************/
-#include "lv_conf.h"
-#include "lvgl/lv_obj/lv_style.h"
+#include "../../lv_conf.h"
+#include "../lv_obj/lv_style.h"
 
 /*********************
  *    DEFINES
diff --git a/lv_themes/lv_theme_alien.c b/lv_themes/lv_theme_alien.c
index 301e184403..b1a7327dce 100644
--- a/lv_themes/lv_theme_alien.c
+++ b/lv_themes/lv_theme_alien.c
@@ -6,11 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lvgl/lvgl.h"
 #include "lv_theme.h"
 
-#include "lv_conf.h"
-
 #if USE_LV_THEME_ALIEN
 
 /*********************
diff --git a/lv_themes/lv_theme_alien.h b/lv_themes/lv_theme_alien.h
index e974982cad..a9506e3690 100644
--- a/lv_themes/lv_theme_alien.h
+++ b/lv_themes/lv_theme_alien.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #if USE_LV_THEME_ALIEN
 
diff --git a/lv_themes/lv_theme_default.c b/lv_themes/lv_theme_default.c
index 863cfdefdd..2c90838f0e 100644
--- a/lv_themes/lv_theme_default.c
+++ b/lv_themes/lv_theme_default.c
@@ -6,11 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lvgl/lvgl.h"
 #include "lv_theme.h"
 
-#include "lv_conf.h"
-
 #if USE_LV_THEME_DEFAULT
 
 /*********************
diff --git a/lv_themes/lv_theme_default.h b/lv_themes/lv_theme_default.h
index ec72f71ef4..e807ac7bd0 100644
--- a/lv_themes/lv_theme_default.h
+++ b/lv_themes/lv_theme_default.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #if USE_LV_THEME_DEFAULT
 
diff --git a/lv_themes/lv_theme_night.c b/lv_themes/lv_theme_night.c
index 393a69aaeb..c9aa1d4672 100644
--- a/lv_themes/lv_theme_night.c
+++ b/lv_themes/lv_theme_night.c
@@ -6,11 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lvgl/lvgl.h"
 #include "lv_theme.h"
 
-#include "lv_conf.h"
-
 #if USE_LV_THEME_NIGHT
 
 /*********************
diff --git a/lv_themes/lv_theme_night.h b/lv_themes/lv_theme_night.h
index a9f534f91c..5780b3462b 100644
--- a/lv_themes/lv_theme_night.h
+++ b/lv_themes/lv_theme_night.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #if USE_LV_THEME_NIGHT
 
diff --git a/lv_themes/lv_theme_templ.c b/lv_themes/lv_theme_templ.c
index 4a76c655bc..ba75f6bdee 100644
--- a/lv_themes/lv_theme_templ.c
+++ b/lv_themes/lv_theme_templ.c
@@ -6,10 +6,8 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "lvgl/lvgl.h"
 #include "lv_theme.h"
 
-#include "lv_conf.h"
 
 #if USE_LV_THEME_TEMPL
 
diff --git a/lv_themes/lv_theme_templ.h b/lv_themes/lv_theme_templ.h
index 6cf54d8d91..28ab0d280b 100644
--- a/lv_themes/lv_theme_templ.h
+++ b/lv_themes/lv_theme_templ.h
@@ -13,7 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "lv_conf.h"
+#include "../../lv_conf.h"
 
 #if USE_LV_THEME_TEMPL
 
diff --git a/lvgl.h b/lvgl.h
index 20e50bdd5f..3d6d525f3c 100644
--- a/lvgl.h
+++ b/lvgl.h
@@ -58,14 +58,6 @@ extern "C" {
 #define LVGL_VERSION_PATH   0
 #define LVGL_VERSION_INFO   "beta"
 
-#if MISC_VERSION_MINOR < LV_MISC_REQ_MINOR /*The version minor has to be the same or greater*/
-#error "LV: incompatible misc. module version! See lvgl.h"
-#endif
-
-#if MISC_VERSION_PATCH < LV_MISC_REQ_PATCH /*The version patch has to be the same or greater*/
-#error "LV: incompatible misc. module version! See lvgl.h"
-#endif
-
 /**********************
  *      TYPEDEFS
  **********************/