diff --git a/lv_core/lv_group.h b/lv_core/lv_group.h
index 1914d6016..a28ab0ea7 100644
--- a/lv_core/lv_group.h
+++ b/lv_core/lv_group.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #include "lv_obj.h"
 
 /*********************
diff --git a/lv_core/lv_indev.c b/lv_core/lv_indev.c
index a0153598c..c68f897b7 100644
--- a/lv_core/lv_indev.c
+++ b/lv_core/lv_indev.c
@@ -7,7 +7,6 @@
  *      INCLUDES
  ********************/
 #include "lv_indev.h"
-#include "../../lv_conf.h"
 
 #include "../lv_hal/lv_hal_tick.h"
 #include "../lv_core/lv_group.h"
diff --git a/lv_core/lv_obj.h b/lv_core/lv_obj.h
index 7735fbc89..98c9625eb 100644
--- a/lv_core/lv_obj.h
+++ b/lv_core/lv_obj.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #include <stddef.h>
 #include <stdbool.h>
 #include "lv_style.h"
diff --git a/lv_core/lv_refr.c b/lv_core/lv_refr.c
index d0ba37d17..d3f78d1b1 100644
--- a/lv_core/lv_refr.c
+++ b/lv_core/lv_refr.c
@@ -6,7 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
 #include <stddef.h>
 #include "lv_refr.h"
 #include "lv_vdb.h"
diff --git a/lv_core/lv_refr.h b/lv_core/lv_refr.h
index 50b710e0f..b6195cc85 100644
--- a/lv_core/lv_refr.h
+++ b/lv_core/lv_refr.h
@@ -16,7 +16,6 @@ extern "C" {
 #include "lv_obj.h"
 #include <stdbool.h>
 
-
 /*********************
  *      DEFINES
  *********************/
diff --git a/lv_core/lv_style.c b/lv_core/lv_style.c
index 08f18d125..3866a2da7 100644
--- a/lv_core/lv_style.c
+++ b/lv_core/lv_style.c
@@ -6,8 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
-#include "lv_style.h"
 #include "lv_obj.h"
 #include "../lv_misc/lv_mem.h"
 
diff --git a/lv_core/lv_vdb.c b/lv_core/lv_vdb.c
index 4cf7fbffb..7894fcea8 100644
--- a/lv_core/lv_vdb.c
+++ b/lv_core/lv_vdb.c
@@ -2,12 +2,12 @@
  * @file lv_vdb.c
  *
  */
-#include "../../lv_conf.h"
+
+#include "lv_vdb.h"
 #if LV_VDB_SIZE != 0
 
 #include "../lv_hal/lv_hal_disp.h"
 #include <stddef.h>
-#include "lv_vdb.h"
 
 /*********************
  *      INCLUDES
diff --git a/lv_core/lv_vdb.h b/lv_core/lv_vdb.h
index 478b66fd2..9aa0087d3 100644
--- a/lv_core/lv_vdb.h
+++ b/lv_core/lv_vdb.h
@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if LV_VDB_SIZE != 0
 
diff --git a/lv_draw/lv_draw.c b/lv_draw/lv_draw.c
index 6aa820caa..eea5af823 100644
--- a/lv_draw/lv_draw.c
+++ b/lv_draw/lv_draw.c
@@ -6,7 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
 
 #include <stdio.h>
 #include <stdbool.h>
diff --git a/lv_draw/lv_draw.h b/lv_draw/lv_draw.h
index 2b1b0dc2a..593e3e72a 100644
--- a/lv_draw/lv_draw.h
+++ b/lv_draw/lv_draw.h
@@ -13,6 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include "../lv_core/lv_style.h"
 #include "../lv_misc/lv_txt.h"
 
diff --git a/lv_draw/lv_draw_rbasic.h b/lv_draw/lv_draw_rbasic.h
index 1dbc0ea47..7c43b9169 100644
--- a/lv_draw/lv_draw_rbasic.h
+++ b/lv_draw/lv_draw_rbasic.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_REAL_DRAW != 0
 
 #include "../lv_misc/lv_color.h"
diff --git a/lv_draw/lv_draw_vbasic.c b/lv_draw/lv_draw_vbasic.c
index 4185cef85..f94faf57c 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_draw_vbasic.h"
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/lv_draw/lv_draw_vbasic.h b/lv_draw/lv_draw_vbasic.h
index 6c2a594e5..b55237997 100644
--- a/lv_draw/lv_draw_vbasic.h
+++ b/lv_draw/lv_draw_vbasic.h
@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if LV_VDB_SIZE != 0
 
diff --git a/lv_hal/lv_hal_tick.c b/lv_hal/lv_hal_tick.c
index a90c86095..c582e1bc2 100644
--- a/lv_hal/lv_hal_tick.c
+++ b/lv_hal/lv_hal_tick.c
@@ -6,9 +6,14 @@
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include "lv_hal_tick.h"
 #include <stddef.h>
-#include "../../lv_conf.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_misc/lv_anim.h b/lv_misc/lv_anim.h
index 471ee6a99..36c304234 100644
--- a/lv_misc/lv_anim.h
+++ b/lv_misc/lv_anim.h
@@ -14,7 +14,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_ANIMATION
 
 #include <stdint.h>
diff --git a/lv_misc/lv_color.h b/lv_misc/lv_color.h
index e2f30a5d6..fb71c0335 100644
--- a/lv_misc/lv_color.h
+++ b/lv_misc/lv_color.h
@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #include <stdint.h>
 
diff --git a/lv_misc/lv_font.c b/lv_misc/lv_font.c
index ab02484f5..32a3f18cf 100644
--- a/lv_misc/lv_font.c
+++ b/lv_misc/lv_font.c
@@ -6,8 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#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 928775103..664369538 100644
--- a/lv_misc/lv_font.h
+++ b/lv_misc/lv_font.h
@@ -14,7 +14,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/lv_misc/lv_mem.c b/lv_misc/lv_mem.c
index f3f4c8e1a..196fd62c7 100644
--- a/lv_misc/lv_mem.c
+++ b/lv_misc/lv_mem.c
@@ -7,7 +7,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#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 e67ed54a7..bdde8d4bc 100644
--- a/lv_misc/lv_mem.h
+++ b/lv_misc/lv_mem.h
@@ -14,6 +14,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include <stdint.h>
 #include <stddef.h>
 
diff --git a/lv_misc/lv_task.c b/lv_misc/lv_task.c
index 296a1352b..9e1488f54 100644
--- a/lv_misc/lv_task.c
+++ b/lv_misc/lv_task.c
@@ -10,7 +10,6 @@
 #include <stddef.h>
 #include "lv_task.h"
 #include "../lv_hal/lv_hal_tick.h"
-#include "../../lv_conf.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_misc/lv_task.h b/lv_misc/lv_task.h
index 9e3964e16..aa8cb8205 100644
--- a/lv_misc/lv_task.h
+++ b/lv_misc/lv_task.h
@@ -14,6 +14,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include <stdint.h>
 #include <stdbool.h>
 #include "lv_mem.h"
diff --git a/lv_misc/lv_txt.c b/lv_misc/lv_txt.c
index da0006860..ce73bf889 100644
--- a/lv_misc/lv_txt.c
+++ b/lv_misc/lv_txt.c
@@ -7,7 +7,6 @@
  *      INCLUDES
  *********************/
 #include "lv_txt.h"
-#include "../../lv_conf.h"
 #include "lv_math.h"
 
 /*********************
diff --git a/lv_misc/lv_txt.h b/lv_misc/lv_txt.h
index ba1f8f826..852c5cdcb 100644
--- a/lv_misc/lv_txt.h
+++ b/lv_misc/lv_txt.h
@@ -13,6 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
+#include "../../lv_conf.h"
+#endif
+
 #include <stdbool.h>
 #include "lv_area.h"
 #include "lv_font.h"
diff --git a/lv_misc/lv_ufs.h b/lv_misc/lv_ufs.h
index ebd9271d2..b3a83fff8 100644
--- a/lv_misc/lv_ufs.h
+++ b/lv_misc/lv_ufs.h
@@ -15,7 +15,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if USE_LV_FILESYSTEM
 
diff --git a/lv_objx/lv_bar.c b/lv_objx/lv_bar.c
index f60feb1d8..7cc84c951 100644
--- a/lv_objx/lv_bar.c
+++ b/lv_objx/lv_bar.c
@@ -8,10 +8,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_bar.h"
 #if USE_LV_BAR != 0
 
-#include "lv_bar.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
diff --git a/lv_objx/lv_bar.h b/lv_objx/lv_bar.h
index 7e498b36b..e3c76beb4 100644
--- a/lv_objx/lv_bar.h
+++ b/lv_objx/lv_bar.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_BAR != 0
 
 #include "../lv_core/lv_obj.h"
diff --git a/lv_objx/lv_btn.c b/lv_objx/lv_btn.c
index 3a425d4b7..945f28187 100644
--- a/lv_objx/lv_btn.c
+++ b/lv_objx/lv_btn.c
@@ -7,11 +7,10 @@
  *      INCLUDES
  *********************/
 
-#include "../../lv_conf.h"
+#include "lv_btn.h"
 #if USE_LV_BTN != 0
 
 #include <string.h>
-#include "lv_btn.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
diff --git a/lv_objx/lv_btn.h b/lv_objx/lv_btn.h
index df20a4c79..206e11110 100644
--- a/lv_objx/lv_btn.h
+++ b/lv_objx/lv_btn.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_BTN != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_btnm.c b/lv_objx/lv_btnm.c
index 0f3ed1875..da82be8c8 100644
--- a/lv_objx/lv_btnm.c
+++ b/lv_objx/lv_btnm.c
@@ -6,10 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_btnm.h"
 #if USE_LV_BTNM != 0
 
-#include "lv_btnm.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_core/lv_refr.h"
diff --git a/lv_objx/lv_btnm.h b/lv_objx/lv_btnm.h
index 0bae7927d..735496142 100644
--- a/lv_objx/lv_btnm.h
+++ b/lv_objx/lv_btnm.h
@@ -14,7 +14,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_BTNM != 0
 
 #include "../lv_core/lv_obj.h"
diff --git a/lv_objx/lv_cb.c b/lv_objx/lv_cb.c
index 3d12ce935..604aa7573 100644
--- a/lv_objx/lv_cb.c
+++ b/lv_objx/lv_cb.c
@@ -6,10 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_cb.h"
 #if USE_LV_CB != 0
 
-#include "lv_cb.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 
diff --git a/lv_objx/lv_cb.h b/lv_objx/lv_cb.h
index 1d25b7617..1f522000b 100644
--- a/lv_objx/lv_cb.h
+++ b/lv_objx/lv_cb.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_CB != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_chart.c b/lv_objx/lv_chart.c
index 6615ac422..e5b448d97 100644
--- a/lv_objx/lv_chart.c
+++ b/lv_objx/lv_chart.c
@@ -6,10 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_chart.h"
 #if USE_LV_CHART != 0
 
-#include "lv_chart.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 
diff --git a/lv_objx/lv_chart.h b/lv_objx/lv_chart.h
index 60cec31e8..09b68f542 100644
--- a/lv_objx/lv_chart.h
+++ b/lv_objx/lv_chart.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_CHART != 0
 
 #include "../lv_core/lv_obj.h"
diff --git a/lv_objx/lv_cont.c b/lv_objx/lv_cont.c
index 08a8f264d..cbe3fce65 100644
--- a/lv_objx/lv_cont.c
+++ b/lv_objx/lv_cont.c
@@ -6,15 +6,14 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
 
+#include "lv_cont.h"
 #if USE_LV_CONT != 0
 
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 
-#include "lv_cont.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_draw/lv_draw_vbasic.h"
 #include "../lv_themes/lv_theme.h"
diff --git a/lv_objx/lv_cont.h b/lv_objx/lv_cont.h
index 491b8dbbc..3be3eb4f1 100644
--- a/lv_objx/lv_cont.h
+++ b/lv_objx/lv_cont.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_CONT != 0
 
 #include "../lv_core/lv_obj.h"
diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c
index bcd0ec8d2..a05ef924d 100644
--- a/lv_objx/lv_ddlist.c
+++ b/lv_objx/lv_ddlist.c
@@ -7,10 +7,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_ddlist.h"
 #if USE_LV_DDLIST != 0
 
-#include "lv_ddlist.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_core/lv_indev.h"
diff --git a/lv_objx/lv_ddlist.h b/lv_objx/lv_ddlist.h
index 25dac8db1..722100d02 100644
--- a/lv_objx/lv_ddlist.h
+++ b/lv_objx/lv_ddlist.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_DDLIST != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_gauge.c b/lv_objx/lv_gauge.c
index 429c6f9ca..4cf73e65a 100644
--- a/lv_objx/lv_gauge.c
+++ b/lv_objx/lv_gauge.c
@@ -7,10 +7,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_gauge.h"
 #if USE_LV_GAUGE != 0
 
-#include "lv_gauge.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_txt.h"
diff --git a/lv_objx/lv_gauge.h b/lv_objx/lv_gauge.h
index 112567c3c..9354371f5 100644
--- a/lv_objx/lv_gauge.h
+++ b/lv_objx/lv_gauge.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_GAUGE != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_img.c b/lv_objx/lv_img.c
index 28a3d941c..f26b479e9 100644
--- a/lv_objx/lv_img.c
+++ b/lv_objx/lv_img.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_img.h"
 #if USE_LV_IMG != 0
 
 /*Testing of dependencies*/
@@ -14,7 +14,6 @@
 #error "lv_img: lv_label is required. Enable it in lv_conf.h (USE_LV_LABEL  1) "
 #endif
 
-#include "lv_img.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_fs.h"
 #include "../lv_misc/lv_ufs.h"
diff --git a/lv_objx/lv_img.h b/lv_objx/lv_img.h
index 44f05ded1..cba7a0f28 100644
--- a/lv_objx/lv_img.h
+++ b/lv_objx/lv_img.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_IMG != 0
 
 #include "../lv_core/lv_obj.h"
diff --git a/lv_objx/lv_kb.c b/lv_objx/lv_kb.c
index d73e7892a..455b25b20 100644
--- a/lv_objx/lv_kb.c
+++ b/lv_objx/lv_kb.c
@@ -7,10 +7,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_kb.h"
 #if USE_LV_KB != 0
 
-#include "lv_kb.h"
 #include "lv_ta.h"
 #include "../lv_themes/lv_theme.h"
 
diff --git a/lv_objx/lv_kb.h b/lv_objx/lv_kb.h
index 722e24bb6..7d9abbacc 100644
--- a/lv_objx/lv_kb.h
+++ b/lv_objx/lv_kb.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_KB != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_label.c b/lv_objx/lv_label.c
index 3ab0892d8..0cda61a08 100644
--- a/lv_objx/lv_label.c
+++ b/lv_objx/lv_label.c
@@ -6,10 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_label.h"
 #if USE_LV_LABEL != 0
 
-#include "lv_label.h"
 #include "../lv_core/lv_obj.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
diff --git a/lv_objx/lv_label.h b/lv_objx/lv_label.h
index 3f7eb1f85..294013335 100644
--- a/lv_objx/lv_label.h
+++ b/lv_objx/lv_label.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LABEL != 0
 
 #include "../lv_core/lv_obj.h"
diff --git a/lv_objx/lv_led.c b/lv_objx/lv_led.c
index 57b33bdbf..985534da9 100644
--- a/lv_objx/lv_led.c
+++ b/lv_objx/lv_led.c
@@ -6,10 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_led.h"
 #if USE_LV_LED != 0
 
-#include "lv_led.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_draw/lv_draw.h"
 
diff --git a/lv_objx/lv_led.h b/lv_objx/lv_led.h
index f262c751c..8815f1b2a 100644
--- a/lv_objx/lv_led.h
+++ b/lv_objx/lv_led.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LED != 0
 
 #include "../lv_core/lv_obj.h"
diff --git a/lv_objx/lv_line.c b/lv_objx/lv_line.c
index ae548a541..cef87180e 100644
--- a/lv_objx/lv_line.c
+++ b/lv_objx/lv_line.c
@@ -6,10 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_line.h"
 
 #if USE_LV_LINE != 0
-#include "lv_line.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_misc/lv_math.h"
 #include <stdbool.h>
diff --git a/lv_objx/lv_line.h b/lv_objx/lv_line.h
index 3ffebf6a0..a5e6966d8 100644
--- a/lv_objx/lv_line.h
+++ b/lv_objx/lv_line.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LINE != 0
 
 #include "../lv_core/lv_obj.h"
diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c
index b3dfceff9..1c6c5917f 100644
--- a/lv_objx/lv_list.c
+++ b/lv_objx/lv_list.c
@@ -6,10 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_list.h"
 #if USE_LV_LIST != 0
 
-#include "lv_list.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
diff --git a/lv_objx/lv_list.h b/lv_objx/lv_list.h
index 14e5e5b24..70293db2c 100644
--- a/lv_objx/lv_list.h
+++ b/lv_objx/lv_list.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LIST != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_lmeter.c b/lv_objx/lv_lmeter.c
index 67ba8c0d7..adc5879f7 100644
--- a/lv_objx/lv_lmeter.c
+++ b/lv_objx/lv_lmeter.c
@@ -6,10 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_lmeter.h"
 #if USE_LV_LMETER != 0
 
-#include "lv_lmeter.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_core/lv_group.h"
diff --git a/lv_objx/lv_lmeter.h b/lv_objx/lv_lmeter.h
index 12ec82941..0bee226b9 100644
--- a/lv_objx/lv_lmeter.h
+++ b/lv_objx/lv_lmeter.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_LMETER != 0
 
 #include "../lv_core/lv_obj.h"
diff --git a/lv_objx/lv_mbox.c b/lv_objx/lv_mbox.c
index 4692f1d1a..7ecd1f7fb 100644
--- a/lv_objx/lv_mbox.c
+++ b/lv_objx/lv_mbox.c
@@ -7,10 +7,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_mbox.h"
 #if USE_LV_MBOX != 0
 
-#include "lv_mbox.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
diff --git a/lv_objx/lv_mbox.h b/lv_objx/lv_mbox.h
index 459d0930b..f64f47e28 100644
--- a/lv_objx/lv_mbox.h
+++ b/lv_objx/lv_mbox.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #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 5afb3a4d0..3a97803eb 100644
--- a/lv_objx/lv_objx_templ.c
+++ b/lv_objx/lv_objx_templ.c
@@ -13,10 +13,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+//#include "lv_templ.h"	/*TODO uncomment this*/
 #if USE_LV_TEMPL != 0
 
-#include "lv_templ.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_objx_templ.h b/lv_objx/lv_objx_templ.h
index 0521ebfff..3520128f2 100644
--- a/lv_objx/lv_objx_templ.h
+++ b/lv_objx/lv_objx_templ.h
@@ -21,7 +21,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_TEMPL != 0
 
 #include "../lv_core/lv_obj.h"
diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c
index faf7a3953..be71575b7 100644
--- a/lv_objx/lv_page.c
+++ b/lv_objx/lv_page.c
@@ -6,11 +6,10 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "../lv_objx/lv_page.h"
 #if USE_LV_PAGE != 0
 
 #include "../lv_core/lv_group.h"
-#include "../lv_objx/lv_page.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_core/lv_refr.h"
diff --git a/lv_objx/lv_page.h b/lv_objx/lv_page.h
index 84ffe4928..d2cb909af 100644
--- a/lv_objx/lv_page.h
+++ b/lv_objx/lv_page.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_PAGE != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_roller.c b/lv_objx/lv_roller.c
index 8586dd484..46264cee1 100644
--- a/lv_objx/lv_roller.c
+++ b/lv_objx/lv_roller.c
@@ -6,10 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_roller.h"
 #if USE_LV_ROLLER != 0
 
-#include "lv_roller.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_themes/lv_theme.h"
diff --git a/lv_objx/lv_roller.h b/lv_objx/lv_roller.h
index a789ea8de..0d89e1450 100644
--- a/lv_objx/lv_roller.h
+++ b/lv_objx/lv_roller.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_ROLLER != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_slider.c b/lv_objx/lv_slider.c
index 034187749..5d907d0f8 100644
--- a/lv_objx/lv_slider.c
+++ b/lv_objx/lv_slider.c
@@ -7,10 +7,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_slider.h"
 #if USE_LV_SLIDER != 0
 
-#include "lv_slider.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
diff --git a/lv_objx/lv_slider.h b/lv_objx/lv_slider.h
index 2685d0230..b09a8bf8c 100644
--- a/lv_objx/lv_slider.h
+++ b/lv_objx/lv_slider.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_SLIDER != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_sw.c b/lv_objx/lv_sw.c
index f2e5efa9f..48746d341 100644
--- a/lv_objx/lv_sw.c
+++ b/lv_objx/lv_sw.c
@@ -6,7 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_sw.h"
 #if USE_LV_SW != 0
 
 /*Testing of dependencies*/
@@ -14,7 +14,6 @@
 #error "lv_sw: lv_slider is required. Enable it in lv_conf.h (USE_LV_SLIDER  1) "
 #endif
 
-#include "lv_sw.h"
 #include "../lv_themes/lv_theme.h"
 
 /*********************
diff --git a/lv_objx/lv_sw.h b/lv_objx/lv_sw.h
index 64c40754e..eec83ae76 100644
--- a/lv_objx/lv_sw.h
+++ b/lv_objx/lv_sw.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_SW != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c
index a10660470..11a94e115 100644
--- a/lv_objx/lv_ta.c
+++ b/lv_objx/lv_ta.c
@@ -7,10 +7,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_ta.h"
 #if USE_LV_TA != 0
 
-#include "lv_ta.h"
 #include "../lv_core/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_themes/lv_theme.h"
diff --git a/lv_objx/lv_ta.h b/lv_objx/lv_ta.h
index faa19508c..172915cf4 100644
--- a/lv_objx/lv_ta.h
+++ b/lv_objx/lv_ta.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_TA != 0
 
 /*Testing of dependencies*/
diff --git a/lv_objx/lv_tabview.c b/lv_objx/lv_tabview.c
index 503b95e89..b7a45501b 100644
--- a/lv_objx/lv_tabview.c
+++ b/lv_objx/lv_tabview.c
@@ -6,10 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_tabview.h"
 #if USE_LV_TABVIEW != 0
 
-#include "lv_tabview.h"
 #include "lv_btnm.h"
 #include "../lv_themes/lv_theme.h"
 #include "../lv_misc/lv_anim.h"
diff --git a/lv_objx/lv_tabview.h b/lv_objx/lv_tabview.h
index 9e9d75031..810f21dc3 100644
--- a/lv_objx/lv_tabview.h
+++ b/lv_objx/lv_tabview.h
@@ -13,9 +13,13 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
-#if USE_LV_TABVIEW != 0
+#endif
 
+#if USE_LV_TABVIEW != 0
 
 /*Testing of dependencies*/
 #if USE_LV_BTNM == 0
diff --git a/lv_objx/lv_win.c b/lv_objx/lv_win.c
index 2beebd9a8..23546938c 100644
--- a/lv_objx/lv_win.c
+++ b/lv_objx/lv_win.c
@@ -6,10 +6,9 @@
 /*********************
  *      INCLUDES
  *********************/
-#include "../../lv_conf.h"
+#include "lv_win.h"
 #if USE_LV_WIN != 0
 
-#include "lv_win.h"
 #include "../lv_themes/lv_theme.h"
 
 /*********************
diff --git a/lv_objx/lv_win.h b/lv_objx/lv_win.h
index 8eca3d194..b1df228ba 100644
--- a/lv_objx/lv_win.h
+++ b/lv_objx/lv_win.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #if USE_LV_WIN != 0
 
 /*Testing of dependencies*/
diff --git a/lv_themes/lv_theme.h b/lv_themes/lv_theme.h
index 97bff38fc..3fad52820 100644
--- a/lv_themes/lv_theme.h
+++ b/lv_themes/lv_theme.h
@@ -13,7 +13,12 @@ extern "C" {
 /*********************
  *    INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
+
 #include "../lv_core/lv_style.h"
 
 /*********************
diff --git a/lv_themes/lv_theme_alien.h b/lv_themes/lv_theme_alien.h
index a9506e369..9430d7748 100644
--- a/lv_themes/lv_theme_alien.h
+++ b/lv_themes/lv_theme_alien.h
@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if USE_LV_THEME_ALIEN
 
diff --git a/lv_themes/lv_theme_default.h b/lv_themes/lv_theme_default.h
index e807ac7bd..c6e18bc9d 100644
--- a/lv_themes/lv_theme_default.h
+++ b/lv_themes/lv_theme_default.h
@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if USE_LV_THEME_DEFAULT
 
diff --git a/lv_themes/lv_theme_material.h b/lv_themes/lv_theme_material.h
index b7f1a2d71..5894e2d7f 100644
--- a/lv_themes/lv_theme_material.h
+++ b/lv_themes/lv_theme_material.h
@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if USE_LV_THEME_MATERIAL
 
diff --git a/lv_themes/lv_theme_mono.h b/lv_themes/lv_theme_mono.h
index 79293a572..ad07e31e8 100644
--- a/lv_themes/lv_theme_mono.h
+++ b/lv_themes/lv_theme_mono.h
@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if USE_LV_THEME_MONO
 
diff --git a/lv_themes/lv_theme_night.h b/lv_themes/lv_theme_night.h
index 5780b3462..e132ba4ff 100644
--- a/lv_themes/lv_theme_night.h
+++ b/lv_themes/lv_theme_night.h
@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if USE_LV_THEME_NIGHT
 
diff --git a/lv_themes/lv_theme_templ.h b/lv_themes/lv_theme_templ.h
index 28ab0d280..2d2f1cdec 100644
--- a/lv_themes/lv_theme_templ.h
+++ b/lv_themes/lv_theme_templ.h
@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if USE_LV_THEME_TEMPL
 
diff --git a/lv_themes/lv_theme_zen.h b/lv_themes/lv_theme_zen.h
index 49080767c..3a60cd8b6 100644
--- a/lv_themes/lv_theme_zen.h
+++ b/lv_themes/lv_theme_zen.h
@@ -13,7 +13,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#if LV_CONF_INCLUDE_SIMPLE
+#include "lv_conf.h"
+#else
 #include "../../lv_conf.h"
+#endif
 
 #if USE_LV_THEME_ZEN