diff --git a/lvgl.mk b/lvgl.mk
index 830fe1194..1d2ebf1db 100644
--- a/lvgl.mk
+++ b/lvgl.mk
@@ -1,8 +1,8 @@
-include $(LVGL_DIR)/lvgl/src/lv_core/lv_core.mk
-include $(LVGL_DIR)/lvgl/src/lv_hal/lv_hal.mk
-include $(LVGL_DIR)/lvgl/src/lv_objx/lv_objx.mk
-include $(LVGL_DIR)/lvgl/src/lv_font/lv_font.mk
-include $(LVGL_DIR)/lvgl/src/lv_misc/lv_misc.mk
-include $(LVGL_DIR)/lvgl/src/lv_themes/lv_themes.mk
-include $(LVGL_DIR)/lvgl/src/lv_draw/lv_draw.mk
+include $(LVGL_DIR)/src/lv_core/lv_core.mk
+include $(LVGL_DIR)/src/lv_hal/lv_hal.mk
+include $(LVGL_DIR)/src/lv_objx/lv_objx.mk
+include $(LVGL_DIR)/src/lv_font/lv_font.mk
+include $(LVGL_DIR)/src/lv_misc/lv_misc.mk
+include $(LVGL_DIR)/src/lv_themes/lv_themes.mk
+include $(LVGL_DIR)/src/lv_draw/lv_draw.mk
 
diff --git a/src/lv_conf_checker.h b/src/lv_conf_internal.h
similarity index 98%
rename from src/lv_conf_checker.h
rename to src/lv_conf_internal.h
index 4b0d9a67d..5de614627 100644
--- a/src/lv_conf_checker.h
+++ b/src/lv_conf_internal.h
@@ -1,15 +1,25 @@
 /**
  * GENERATED FILE, DO NOT EDIT IT!
- * @file lv_conf_checker.h
+ * @file lv_conf_internal.h
  * Make sure all the defines of lv_conf.h have a default value
 **/
 
-#ifndef LV_CONF_CHECKER_H
-#define LV_CONF_CHECKER_H
+#ifndef LV_CONF_INTERNAL_H
+#define LV_CONF_INTERNAL_H
 /* clang-format off */
 
 #include <stdint.h>
 
+#ifdef LV_CONF_PATH
+#define __LV_TO_STR_AUX(x) #x
+#define __LV_TO_STR(x) __LV_TO_STR_AUX(x)
+#include __LV_TO_STR(LV_CONF_PATH)
+#undef __LV_TO_STR_AUX
+#undef __LV_TO_STR
+#else
+#include "../../lv_conf.h"
+#endif
+
 /*====================
    Graphical settings
  *====================*/
@@ -218,16 +228,6 @@
  * Image decoder and cache
  *========================*/
 
-/* 1: Enable indexed (palette) images */
-#ifndef LV_IMG_CF_INDEXED
-#define LV_IMG_CF_INDEXED       1
-#endif
-
-/* 1: Enable alpha indexed images */
-#ifndef LV_IMG_CF_ALPHA
-#define LV_IMG_CF_ALPHA         1
-#endif
-
 /* Default image cache size. Image caching keeps the images opened.
  * If only the built-in image formats are used there is no real advantage of caching.
  * (I.e. no new image decoder is added)
diff --git a/src/lv_core/lv_core.mk b/src/lv_core/lv_core.mk
index eb1c5e0ca..b07d23290 100644
--- a/src/lv_core/lv_core.mk
+++ b/src/lv_core/lv_core.mk
@@ -6,7 +6,7 @@ CSRCS += lv_refr.c
 CSRCS += lv_style.c
 CSRCS += lv_debug.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_core
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_core
+DEPPATH += --dep-path $(LVGL_DIR)/src/lv_core
+VPATH += :$(LVGL_DIR)/src/lv_core
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_core"
+CFLAGS += "-I$(LVGL_DIR)/src/lv_core"
diff --git a/src/lv_core/lv_group.h b/src/lv_core/lv_group.h
index c27f76939..19a8b4802 100644
--- a/src/lv_core/lv_group.h
+++ b/src/lv_core/lv_group.h
@@ -13,11 +13,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
 
 #include "lv_obj.h"
 
diff --git a/src/lv_core/lv_obj.h b/src/lv_core/lv_obj.h
index 2854c7c9b..ff3d0d6c4 100644
--- a/src/lv_core/lv_obj.h
+++ b/src/lv_core/lv_obj.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #include <stddef.h>
 #include <stdbool.h>
diff --git a/src/lv_draw/lv_draw.h b/src/lv_draw/lv_draw.h
index 8beabd53b..c9f0339a6 100644
--- a/src/lv_draw/lv_draw.h
+++ b/src/lv_draw/lv_draw.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #include "../lv_core/lv_style.h"
 #include "../lv_misc/lv_txt.h"
diff --git a/src/lv_draw/lv_draw.mk b/src/lv_draw/lv_draw.mk
index ea09d6cac..133a4a45a 100644
--- a/src/lv_draw/lv_draw.mk
+++ b/src/lv_draw/lv_draw.mk
@@ -10,7 +10,7 @@ CSRCS += lv_img_decoder.c
 CSRCS += lv_img_cache.c
 CSRCS += lv_img_buf.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_draw
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_draw
+DEPPATH += --dep-path $(LVGL_DIR)/src/lv_draw
+VPATH += :$(LVGL_DIR)/src/lv_draw
 
-CFLAGS += "-I$(LVGL_DIR)lvgl/src/lv_draw"
+CFLAGS += "-I$(LVGL_DIR)/src/lv_draw"
diff --git a/src/lv_draw/lv_img_decoder.h b/src/lv_draw/lv_img_decoder.h
index a1713e0c0..66918189f 100644
--- a/src/lv_draw/lv_img_decoder.h
+++ b/src/lv_draw/lv_img_decoder.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #include <stdint.h>
 #include "lv_img_buf.h"
diff --git a/src/lv_font/lv_font.h b/src/lv_font/lv_font.h
index 27936274e..392516d9f 100644
--- a/src/lv_font/lv_font.h
+++ b/src/lv_font/lv_font.h
@@ -13,12 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
-
+#include "../lv_conf_internal.h"
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
diff --git a/src/lv_font/lv_font.mk b/src/lv_font/lv_font.mk
index 836d86a6c..14477ffb6 100644
--- a/src/lv_font/lv_font.mk
+++ b/src/lv_font/lv_font.mk
@@ -6,7 +6,7 @@ CSRCS += lv_font_roboto_22.c
 CSRCS += lv_font_roboto_28.c
 CSRCS += lv_font_unscii_8.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_font
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_font
+DEPPATH += --dep-path $(LVGL_DIR)/src/lv_font
+VPATH += :$(LVGL_DIR)/src/lv_font
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_font"
+CFLAGS += "-I$(LVGL_DIR)/src/lv_font"
diff --git a/src/lv_font/lv_font_fmt_txt.h b/src/lv_font/lv_font_fmt_txt.h
index 46b9d3985..1bae3f7f6 100644
--- a/src/lv_font/lv_font_fmt_txt.h
+++ b/src/lv_font/lv_font_fmt_txt.h
@@ -13,12 +13,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
-
 #include <stdint.h>
 #include <stddef.h>
 #include <stdbool.h>
diff --git a/src/lv_font/lv_symbol_def.h b/src/lv_font/lv_symbol_def.h
index 6fe823b72..43a6a29ca 100644
--- a/src/lv_font/lv_symbol_def.h
+++ b/src/lv_font/lv_symbol_def.h
@@ -5,11 +5,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+
+#include "../lv_conf_internal.h"
 
 /* In the font converter use this list as range:
       61441, 61448, 61451, 61452, 61452, 61453, 61457, 61459, 61461, 61465,
diff --git a/src/lv_hal/lv_hal.mk b/src/lv_hal/lv_hal.mk
index 05af078ce..20bfb7d18 100644
--- a/src/lv_hal/lv_hal.mk
+++ b/src/lv_hal/lv_hal.mk
@@ -2,7 +2,7 @@ CSRCS += lv_hal_disp.c
 CSRCS += lv_hal_indev.c
 CSRCS += lv_hal_tick.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_hal
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_hal
+DEPPATH += --dep-path $(LVGL_DIR)/src/lv_hal
+VPATH += :$(LVGL_DIR)/src/lv_hal
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_hal"
+CFLAGS += "-I$(LVGL_DIR)/src/lv_hal"
diff --git a/src/lv_hal/lv_hal_indev.h b/src/lv_hal/lv_hal_indev.h
index ee39e6e95..38b9b5214 100644
--- a/src/lv_hal/lv_hal_indev.h
+++ b/src/lv_hal/lv_hal_indev.h
@@ -15,11 +15,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/src/lv_hal/lv_hal_tick.c b/src/lv_hal/lv_hal_tick.c
index cdfec32c3..388cdf63c 100644
--- a/src/lv_hal/lv_hal_tick.c
+++ b/src/lv_hal/lv_hal_tick.c
@@ -6,12 +6,6 @@
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
-
 #include "lv_hal_tick.h"
 #include <stddef.h>
 
diff --git a/src/lv_hal/lv_hal_tick.h b/src/lv_hal/lv_hal_tick.h
index a4de881f5..f99d5188c 100644
--- a/src/lv_hal/lv_hal_tick.h
+++ b/src/lv_hal/lv_hal_tick.h
@@ -13,11 +13,8 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
+
 #include <stdint.h>
 #include <stdbool.h>
 
diff --git a/src/lv_misc/lv_anim.h b/src/lv_misc/lv_anim.h
index 95fd6acea..a0f94b73d 100644
--- a/src/lv_misc/lv_anim.h
+++ b/src/lv_misc/lv_anim.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/src/lv_misc/lv_area.c b/src/lv_misc/lv_area.c
index 174e4f860..0c43b3a5d 100644
--- a/src/lv_misc/lv_area.c
+++ b/src/lv_misc/lv_area.c
@@ -6,11 +6,7 @@
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #include "lv_area.h"
 #include "lv_math.h"
diff --git a/src/lv_misc/lv_area.h b/src/lv_misc/lv_area.h
index 375fa009f..bff022309 100644
--- a/src/lv_misc/lv_area.h
+++ b/src/lv_misc/lv_area.h
@@ -13,14 +13,10 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#include "../lv_conf_internal.h"
 #include <string.h>
 #include <stdbool.h>
 #include <stdint.h>
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
 
 /*********************
  *      DEFINES
diff --git a/src/lv_misc/lv_bidi.h b/src/lv_misc/lv_bidi.h
index dfa6565bd..dd9bd2bb6 100644
--- a/src/lv_misc/lv_bidi.h
+++ b/src/lv_misc/lv_bidi.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/src/lv_misc/lv_color.h b/src/lv_misc/lv_color.h
index 4ba833d8c..0dce299f8 100644
--- a/src/lv_misc/lv_color.h
+++ b/src/lv_misc/lv_color.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 /*Error checking*/
 #if LV_COLOR_DEPTH == 24
diff --git a/src/lv_misc/lv_fs.h b/src/lv_misc/lv_fs.h
index f18242820..9731458dd 100644
--- a/src/lv_misc/lv_fs.h
+++ b/src/lv_misc/lv_fs.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_FILESYSTEM
 
@@ -34,8 +30,9 @@ extern "C" {
 /**********************
  *      TYPEDEFS
  **********************/
+
 /**
- * Errors in the filesystem module.
+ * Errors in the file system module.
  */
 enum {
     LV_FS_RES_OK = 0,
diff --git a/src/lv_misc/lv_gc.h b/src/lv_misc/lv_gc.h
index a2acec5ab..a706f2c1c 100644
--- a/src/lv_misc/lv_gc.h
+++ b/src/lv_misc/lv_gc.h
@@ -13,13 +13,6 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-
-#ifdef 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/src/lv_misc/lv_log.h b/src/lv_misc/lv_log.h
index 62c613b43..d43db790b 100644
--- a/src/lv_misc/lv_log.h
+++ b/src/lv_misc/lv_log.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 #include <stdint.h>
 
 /*********************
diff --git a/src/lv_misc/lv_mem.h b/src/lv_misc/lv_mem.h
index 0aba248ce..729cd2465 100644
--- a/src/lv_misc/lv_mem.h
+++ b/src/lv_misc/lv_mem.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/src/lv_misc/lv_misc.mk b/src/lv_misc/lv_misc.mk
index d0b682ab2..29fb82a0e 100644
--- a/src/lv_misc/lv_misc.mk
+++ b/src/lv_misc/lv_misc.mk
@@ -15,7 +15,7 @@ CSRCS += lv_async.c
 CSRCS += lv_printf.c
 CSRCS += lv_bidi.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_misc
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_misc
+DEPPATH += --dep-path $(LVGL_DIR)/src/lv_misc
+VPATH += :$(LVGL_DIR)/src/lv_misc
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_misc"
+CFLAGS += "-I$(LVGL_DIR)/src/lv_misc"
diff --git a/src/lv_misc/lv_printf.h b/src/lv_misc/lv_printf.h
index b3b8598dd..4a8bd609b 100644
--- a/src/lv_misc/lv_printf.h
+++ b/src/lv_misc/lv_printf.h
@@ -37,12 +37,7 @@
 extern "C" {
 #endif
 
-
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_SPRINTF_CUSTOM == 0
 
diff --git a/src/lv_misc/lv_task.h b/src/lv_misc/lv_task.h
index 05ff02b60..a48b9c29c 100644
--- a/src/lv_misc/lv_task.h
+++ b/src/lv_misc/lv_task.h
@@ -14,11 +14,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/src/lv_misc/lv_txt.h b/src/lv_misc/lv_txt.h
index 6dbce5d44..1a6ff4fc8 100644
--- a/src/lv_misc/lv_txt.h
+++ b/src/lv_misc/lv_txt.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #include <stdbool.h>
 #include "lv_area.h"
diff --git a/src/lv_objx/lv_arc.h b/src/lv_objx/lv_arc.h
index 89800958b..1579f8baa 100644
--- a/src/lv_objx/lv_arc.h
+++ b/src/lv_objx/lv_arc.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_ARC != 0
 
diff --git a/src/lv_objx/lv_bar.h b/src/lv_objx/lv_bar.h
index 86747c43c..d0b02e2c0 100644
--- a/src/lv_objx/lv_bar.h
+++ b/src/lv_objx/lv_bar.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_BAR != 0
 
diff --git a/src/lv_objx/lv_btn.h b/src/lv_objx/lv_btn.h
index f7bd85faa..d68392b84 100644
--- a/src/lv_objx/lv_btn.h
+++ b/src/lv_objx/lv_btn.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_BTN != 0
 
diff --git a/src/lv_objx/lv_btnm.h b/src/lv_objx/lv_btnm.h
index 44bc4efbb..3e91f2b23 100644
--- a/src/lv_objx/lv_btnm.h
+++ b/src/lv_objx/lv_btnm.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_BTNM != 0
 
diff --git a/src/lv_objx/lv_calendar.h b/src/lv_objx/lv_calendar.h
index 21317bbd7..b415aa344 100644
--- a/src/lv_objx/lv_calendar.h
+++ b/src/lv_objx/lv_calendar.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_CALENDAR != 0
 
diff --git a/src/lv_objx/lv_canvas.h b/src/lv_objx/lv_canvas.h
index 9a648e5c1..c25541427 100644
--- a/src/lv_objx/lv_canvas.h
+++ b/src/lv_objx/lv_canvas.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_CANVAS != 0
 
diff --git a/src/lv_objx/lv_cb.h b/src/lv_objx/lv_cb.h
index a6b1e74ad..57aa80478 100644
--- a/src/lv_objx/lv_cb.h
+++ b/src/lv_objx/lv_cb.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_CB != 0
 
diff --git a/src/lv_objx/lv_chart.h b/src/lv_objx/lv_chart.h
index e775970f9..4af6b6f3e 100644
--- a/src/lv_objx/lv_chart.h
+++ b/src/lv_objx/lv_chart.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_CHART != 0
 
diff --git a/src/lv_objx/lv_cont.h b/src/lv_objx/lv_cont.h
index a2346c6ff..5b29c073a 100644
--- a/src/lv_objx/lv_cont.h
+++ b/src/lv_objx/lv_cont.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_CONT != 0
 
diff --git a/src/lv_objx/lv_cpicker.h b/src/lv_objx/lv_cpicker.h
index a9feee5ae..70193f0ea 100644
--- a/src/lv_objx/lv_cpicker.h
+++ b/src/lv_objx/lv_cpicker.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_CPICKER != 0
 
diff --git a/src/lv_objx/lv_ddlist.h b/src/lv_objx/lv_ddlist.h
index e4d918b17..43c802ccf 100644
--- a/src/lv_objx/lv_ddlist.h
+++ b/src/lv_objx/lv_ddlist.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_DDLIST != 0
 
diff --git a/src/lv_objx/lv_gauge.h b/src/lv_objx/lv_gauge.h
index a80ad1df2..012cdfa4b 100644
--- a/src/lv_objx/lv_gauge.h
+++ b/src/lv_objx/lv_gauge.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_GAUGE != 0
 
diff --git a/src/lv_objx/lv_img.h b/src/lv_objx/lv_img.h
index a784e8711..f4fcc7a04 100644
--- a/src/lv_objx/lv_img.h
+++ b/src/lv_objx/lv_img.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_IMG != 0
 
diff --git a/src/lv_objx/lv_imgbtn.h b/src/lv_objx/lv_imgbtn.h
index b28b74ff4..37be25d6d 100644
--- a/src/lv_objx/lv_imgbtn.h
+++ b/src/lv_objx/lv_imgbtn.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_IMGBTN != 0
 
diff --git a/src/lv_objx/lv_kb.h b/src/lv_objx/lv_kb.h
index 8e25eab7a..97de1ae5c 100644
--- a/src/lv_objx/lv_kb.h
+++ b/src/lv_objx/lv_kb.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_KB != 0
 
diff --git a/src/lv_objx/lv_label.h b/src/lv_objx/lv_label.h
index 976854235..287888658 100644
--- a/src/lv_objx/lv_label.h
+++ b/src/lv_objx/lv_label.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_LABEL != 0
 
diff --git a/src/lv_objx/lv_led.h b/src/lv_objx/lv_led.h
index a0c9125e8..abe5a627c 100644
--- a/src/lv_objx/lv_led.h
+++ b/src/lv_objx/lv_led.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_LED != 0
 
diff --git a/src/lv_objx/lv_line.h b/src/lv_objx/lv_line.h
index cfea7368e..7c456596e 100644
--- a/src/lv_objx/lv_line.h
+++ b/src/lv_objx/lv_line.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_LINE != 0
 
diff --git a/src/lv_objx/lv_list.h b/src/lv_objx/lv_list.h
index e17bc87d5..12f3f7d24 100644
--- a/src/lv_objx/lv_list.h
+++ b/src/lv_objx/lv_list.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_LIST != 0
 
diff --git a/src/lv_objx/lv_lmeter.h b/src/lv_objx/lv_lmeter.h
index 6deac8ce8..bf6ce959e 100644
--- a/src/lv_objx/lv_lmeter.h
+++ b/src/lv_objx/lv_lmeter.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_LMETER != 0
 
diff --git a/src/lv_objx/lv_mbox.h b/src/lv_objx/lv_mbox.h
index 2068b3735..5d194de22 100644
--- a/src/lv_objx/lv_mbox.h
+++ b/src/lv_objx/lv_mbox.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_MBOX != 0
 
diff --git a/src/lv_objx/lv_objmask.h b/src/lv_objx/lv_objmask.h
index 18a0506f7..71c1371d7 100644
--- a/src/lv_objx/lv_objmask.h
+++ b/src/lv_objx/lv_objmask.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_OBJMASK != 0
 
diff --git a/src/lv_objx/lv_objx.mk b/src/lv_objx/lv_objx.mk
index 5879b420e..ae8d8e4e9 100644
--- a/src/lv_objx/lv_objx.mk
+++ b/src/lv_objx/lv_objx.mk
@@ -32,7 +32,7 @@ CSRCS += lv_sw.c
 CSRCS += lv_win.c
 CSRCS += lv_objmask.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_objx
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_objx
+DEPPATH += --dep-path $(LVGL_DIR)/src/lv_objx
+VPATH += :$(LVGL_DIR)/src/lv_objx
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_objx"
+CFLAGS += "-I$(LVGL_DIR)/src/lv_objx"
diff --git a/src/lv_objx/lv_objx_templ.h b/src/lv_objx/lv_objx_templ.h
index 82918253b..fa5a32cf1 100644
--- a/src/lv_objx/lv_objx_templ.h
+++ b/src/lv_objx/lv_objx_templ.h
@@ -20,11 +20,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_TEMPL != 0
 
diff --git a/src/lv_objx/lv_page.h b/src/lv_objx/lv_page.h
index 86e1b0a4d..f11ce0158 100644
--- a/src/lv_objx/lv_page.h
+++ b/src/lv_objx/lv_page.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_PAGE != 0
 
diff --git a/src/lv_objx/lv_preload.h b/src/lv_objx/lv_preload.h
index 22b87f32f..03a34e4f9 100644
--- a/src/lv_objx/lv_preload.h
+++ b/src/lv_objx/lv_preload.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_PRELOAD != 0
 
diff --git a/src/lv_objx/lv_roller.h b/src/lv_objx/lv_roller.h
index 6375d34c1..2d25ab520 100644
--- a/src/lv_objx/lv_roller.h
+++ b/src/lv_objx/lv_roller.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_ROLLER != 0
 
diff --git a/src/lv_objx/lv_slider.h b/src/lv_objx/lv_slider.h
index 34398889c..a8e634442 100644
--- a/src/lv_objx/lv_slider.h
+++ b/src/lv_objx/lv_slider.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_SLIDER != 0
 
diff --git a/src/lv_objx/lv_spinbox.h b/src/lv_objx/lv_spinbox.h
index ea60169e3..d22be5622 100644
--- a/src/lv_objx/lv_spinbox.h
+++ b/src/lv_objx/lv_spinbox.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_SPINBOX != 0
 
diff --git a/src/lv_objx/lv_sw.h b/src/lv_objx/lv_sw.h
index da988b0c8..480ff4ed3 100644
--- a/src/lv_objx/lv_sw.h
+++ b/src/lv_objx/lv_sw.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_SW != 0
 
diff --git a/src/lv_objx/lv_ta.h b/src/lv_objx/lv_ta.h
index afbb94bc2..8ad840c80 100644
--- a/src/lv_objx/lv_ta.h
+++ b/src/lv_objx/lv_ta.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_TA != 0
 
diff --git a/src/lv_objx/lv_table.h b/src/lv_objx/lv_table.h
index d6a0be7d1..e6856e08e 100644
--- a/src/lv_objx/lv_table.h
+++ b/src/lv_objx/lv_table.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_TABLE != 0
 
diff --git a/src/lv_objx/lv_tabview.h b/src/lv_objx/lv_tabview.h
index e1383140b..826226e1e 100644
--- a/src/lv_objx/lv_tabview.h
+++ b/src/lv_objx/lv_tabview.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_TABVIEW != 0
 
diff --git a/src/lv_objx/lv_tileview.h b/src/lv_objx/lv_tileview.h
index aca10f76a..cdef9b003 100644
--- a/src/lv_objx/lv_tileview.h
+++ b/src/lv_objx/lv_tileview.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_TILEVIEW != 0
 
diff --git a/src/lv_objx/lv_win.h b/src/lv_objx/lv_win.h
index 28560cf6c..0603f567c 100644
--- a/src/lv_objx/lv_win.h
+++ b/src/lv_objx/lv_win.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_WIN != 0
 
diff --git a/src/lv_themes/lv_theme.h b/src/lv_themes/lv_theme.h
index 28b532c61..f277eb076 100644
--- a/src/lv_themes/lv_theme.h
+++ b/src/lv_themes/lv_theme.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *    INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #include "../lv_core/lv_style.h"
 #include "../lv_core/lv_group.h"
diff --git a/src/lv_themes/lv_theme_alien.h b/src/lv_themes/lv_theme_alien.h
index a3d5851fb..4498db64c 100644
--- a/src/lv_themes/lv_theme_alien.h
+++ b/src/lv_themes/lv_theme_alien.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_THEME_ALIEN
 
diff --git a/src/lv_themes/lv_theme_default.h b/src/lv_themes/lv_theme_default.h
index 4a2ecc080..dfd7b62f8 100644
--- a/src/lv_themes/lv_theme_default.h
+++ b/src/lv_themes/lv_theme_default.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_THEME_DEFAULT
 
diff --git a/src/lv_themes/lv_theme_material.h b/src/lv_themes/lv_theme_material.h
index 1f2e1b7e1..7915f54a6 100644
--- a/src/lv_themes/lv_theme_material.h
+++ b/src/lv_themes/lv_theme_material.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_THEME_MATERIAL
 
diff --git a/src/lv_themes/lv_theme_mono.h b/src/lv_themes/lv_theme_mono.h
index 6730d1e9b..a24b1bf48 100644
--- a/src/lv_themes/lv_theme_mono.h
+++ b/src/lv_themes/lv_theme_mono.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_THEME_MONO
 
diff --git a/src/lv_themes/lv_theme_nemo.h b/src/lv_themes/lv_theme_nemo.h
index 5464cbfd1..5bf74c578 100644
--- a/src/lv_themes/lv_theme_nemo.h
+++ b/src/lv_themes/lv_theme_nemo.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_THEME_NEMO
 
diff --git a/src/lv_themes/lv_theme_night.h b/src/lv_themes/lv_theme_night.h
index a009bed00..4a4ea0c4c 100644
--- a/src/lv_themes/lv_theme_night.h
+++ b/src/lv_themes/lv_theme_night.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_THEME_NIGHT
 
diff --git a/src/lv_themes/lv_theme_templ.h b/src/lv_themes/lv_theme_templ.h
index 7d1e3ec69..020eacade 100644
--- a/src/lv_themes/lv_theme_templ.h
+++ b/src/lv_themes/lv_theme_templ.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_THEME_TEMPL
 
diff --git a/src/lv_themes/lv_theme_zen.h b/src/lv_themes/lv_theme_zen.h
index 4a497fe3a..995038c1f 100644
--- a/src/lv_themes/lv_theme_zen.h
+++ b/src/lv_themes/lv_theme_zen.h
@@ -13,11 +13,7 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#ifdef LV_CONF_INCLUDE_SIMPLE
-#include "lv_conf.h"
-#else
-#include "../../../lv_conf.h"
-#endif
+#include "../lv_conf_internal.h"
 
 #if LV_USE_THEME_ZEN
 
diff --git a/src/lv_themes/lv_themes.mk b/src/lv_themes/lv_themes.mk
index fce41e4e1..ee87a0943 100644
--- a/src/lv_themes/lv_themes.mk
+++ b/src/lv_themes/lv_themes.mk
@@ -8,7 +8,7 @@ CSRCS += lv_theme_material.c
 CSRCS += lv_theme_nemo.c
 CSRCS += lv_theme_mono.c
 
-DEPPATH += --dep-path $(LVGL_DIR)/lvgl/src/lv_themes
-VPATH += :$(LVGL_DIR)/lvgl/src/lv_themes
+DEPPATH += --dep-path $(LVGL_DIR)/src/lv_themes
+VPATH += :$(LVGL_DIR)/src/lv_themes
 
-CFLAGS += "-I$(LVGL_DIR)/lvgl/src/lv_themes"
+CFLAGS += "-I$(LVGL_DIR)/src/lv_themes"
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 000000000..5fc4b6732
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,45 @@
+#
+# Makefile
+#
+CC ?= gcc
+LVGL_DIR ?= ${shell pwd}/..
+
+WARNINGS ?= -Wall -Wextra
+OPTIMIZATION ?= -O3 -g0
+
+
+CFLAGS ?= -I$(LVGL_DIR)/ $(DEFINES) $(WARNINGS) $(OPTIMIZATION) -I$(LVGL_DIR) -I.
+
+LDFLAGS ?=  
+BIN ?= demo
+
+
+#Collect the files to compile
+MAINSRC = ./test_main.c
+
+include $(LVGL_DIR)/lvgl.mk
+
+OBJEXT ?= .o
+
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
+
+MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
+
+SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
+OBJS = $(AOBJS) $(COBJS)
+
+## MAINOBJ -> OBJFILES
+
+all: default
+
+%.o: %.c
+	@$(CC)  $(CFLAGS) -c $< -o $@
+	@echo "CC $<"
+    
+default: $(AOBJS) $(COBJS) $(MAINOBJ)
+	$(CC) -o $(BIN) $(MAINOBJ) $(AOBJS) $(COBJS) $(LDFLAGS)
+
+clean: 
+	rm -f $(BIN) $(AOBJS) $(COBJS) $(MAINOBJ)
+
diff --git a/tests/build.py b/tests/build.py
new file mode 100644
index 000000000..46e8d5756
--- /dev/null
+++ b/tests/build.py
@@ -0,0 +1,325 @@
+import os
+
+warnings = '"-Wall"' 
+base_defines = '"-DLV_CONF_PATH=tests/lv_test_conf.h -DLV_BUILD_TEST"'
+optimization = '"-O3 -g0"'
+
+
+def build(name, defines):
+  global warnings, base_defines, optimization
+
+  print("=============================")
+  print(name)
+  print("=============================")
+  
+  d_all = base_defines[:-1] + " ";
+  
+  for d in defines:
+    d_all += " -D" + d + "=" + str(defines[d])
+  
+  d_all += '"'
+  cmd = "make -j8 BIN=test.bin DEFINES=" + d_all + " WARNINGS=" + warnings + " OPTIMIZATION=" + optimization
+  
+  print("---------------------------")
+  print("Clean")
+  print("---------------------------")
+  os.system("make clean")
+  os.system("rm -f ./test.bin")
+  print("---------------------------")
+  print("Build")
+  print("---------------------------")
+  ret = os.system(cmd)
+  if(ret != 0): 
+    print("BUILD ERROR! (error code  " + str(ret) + ")")
+    exit(1)
+  
+  print("---------------------------")
+  print("Run")
+  print("---------------------------")
+  ret = os.system("./test.bin")
+  if(ret != 0): 
+    print("RUN ERROR! (error code  " + str(ret) + ")")
+    exit(1)
+  
+  print("---------------------------")
+  print("Finished")
+  print("---------------------------")
+
+
+minimal_monochrome = {
+  "LV_DPI":40,
+  "LV_MEM_SIZE":4*1024,
+  "LV_HOR_RES_MAX":128,
+  "LV_VER_RES_MAX":64,
+  "LV_COLOR_DEPTH":1,
+  "LV_USE_GROUP":0,
+  "LV_USE_ANIMATION":0,
+  "LV_ANTIALAIS":0,
+  "LV_GPU":0,
+  "LV_USE_FILESYSTEM":0,
+  "LV_USE_USER_DATA":0,
+  "LV_USE_LOG":0,
+  "LV_USE_DEBUG":0,
+  "LV_THEME_LIVE_UPDATE":0,
+  "LV_FONT_ROBOTO_12":0,
+  "LV_FONT_ROBOTO_16":0,
+  "LV_FONT_ROBOTO_22":0,
+  "LV_FONT_ROBOTO_28":0,
+  "LV_FONT_ROBOTO_12_SUBPX":0,
+  "LV_FONT_ROBOTO_28_COMPRESSED":0,
+  "LV_FONT_UNSCII_8":1,
+  "LV_FONT_DEFAULT":"\\\"&lv_font_unscii_8\\\"",
+  "LV_USE_BIDI": 0,
+  "LV_USE_OBJ_REALIGN": 0,
+  "LV_USE_ARC":0,
+  "LV_USE_BAR":1,
+  "LV_USE_BTN":1,
+  "LV_USE_BTNM":0,
+  "LV_USE_CALENDAR":0,
+  "LV_USE_CANVAS":0,
+  "LV_USE_CB":0,
+  "LV_USE_CHART":0,
+  "LV_USE_CONT":1,
+  "LV_USE_CPICKER":0,
+  "LV_USE_DDLIST":0,
+  "LV_USE_GAUGE":0,
+  "LV_USE_IMG":1,
+  "LV_USE_IMGBTN":0,
+  "LV_USE_KB":0,
+  "LV_USE_LABEL":1,
+  "LV_USE_LED":0,
+  "LV_USE_LINE":0,
+  "LV_USE_LIST":0,
+  "LV_USE_LMETER":0,
+  "LV_USE_OBJMASK":0,
+  "LV_USE_MBOX":0,
+  "LV_USE_PAGE":0,
+  "LV_USE_PRELOAD":0,
+  "LV_USE_ROLLER":0,
+  "LV_USE_SLIDER":0,
+  "LV_USE_SPINBOX":0,
+  "LV_USE_SW":0,
+  "LV_USE_TA":0,
+  "LV_USE_TABLE":0,
+  "LV_USE_TABVIEW":0,
+  "LV_USE_TILEVIEW":0,
+  "LV_USE_WIN":0 
+}
+
+all_obj_minimal_features = {
+  "LV_DPI":60,
+  "LV_MEM_SIZE":12*1024,
+  "LV_HOR_RES_MAX":320,
+  "LV_VER_RES_MAX":240,
+  "LV_COLOR_DEPTH":8,
+  "LV_USE_GROUP":0,
+  "LV_USE_ANIMATION":0,
+  "LV_ANTIALAIS":0,
+  "LV_GPU":0,
+  "LV_USE_FILESYSTEM":0,
+  "LV_USE_USER_DATA":0,
+  "LV_USE_LOG":0,
+  "LV_USE_DEBUG":0,
+  "LV_THEME_LIVE_UPDATE":0,
+  "LV_FONT_ROBOTO_12":0,
+  "LV_FONT_ROBOTO_16":1,
+  "LV_FONT_ROBOTO_22":0,
+  "LV_FONT_ROBOTO_28":0,
+  "LV_FONT_ROBOTO_12_SUBPX":0,
+  "LV_FONT_ROBOTO_28_COMPRESSED":0,
+  "LV_FONT_UNSCII_8":0,
+  "LV_FONT_DEFAULT":"\\\"&lv_font_roboto_16\\\"",
+  "LV_USE_BIDI": 0,
+  "LV_USE_OBJ_REALIGN": 0,
+  "LV_USE_EXT_CLICK_AREA":"LV_EXT_CLICK_AREA_TINY",
+  "LV_USE_ARC":1,
+  "LV_USE_BAR":1,
+  "LV_USE_BTN":1,
+  "LV_USE_BTNM":1,
+  "LV_USE_CALENDAR":1,
+  "LV_USE_CANVAS":1,
+  "LV_USE_CB":1,
+  "LV_USE_CHART":1,
+  "LV_USE_CONT":1,
+  "LV_USE_CPICKER":1,
+  "LV_USE_DDLIST":1,
+  "LV_USE_GAUGE":1,
+  "LV_USE_IMG":1,
+  "LV_USE_IMGBTN":1,
+  "LV_USE_KB":1,
+  "LV_USE_LABEL":1,
+  "LV_USE_LED":1,
+  "LV_USE_LINE":1,
+  "LV_USE_LIST":1,
+  "LV_USE_LMETER":1,
+  "LV_USE_OBJMASK":1,
+  "LV_USE_MBOX":1,
+  "LV_USE_PAGE":1,
+  "LV_USE_PRELOAD":0, #Disabled beacsue needs anim
+  "LV_USE_ROLLER":1,
+  "LV_USE_SLIDER":1,
+  "LV_USE_SPINBOX":1,
+  "LV_USE_SW":1,
+  "LV_USE_TA":1,
+  "LV_USE_TABLE":1,
+  "LV_USE_TABVIEW":1,
+  "LV_USE_TILEVIEW":1,
+  "LV_USE_WIN":1 
+}
+
+all_obj_all_features = {
+  "LV_DPI":100,
+  "LV_MEM_SIZE":32*1024,
+  "LV_HOR_RES_MAX":480,
+  "LV_VER_RES_MAX":320,
+  "LV_COLOR_DEPTH":16,
+  "LV_USE_GROUP":1,
+  "LV_USE_ANIMATION":1,
+  "LV_ANTIALAIS":1,
+  "LV_GPU":1,
+  "LV_USE_FILESYSTEM":1,
+  "LV_USE_USER_DATA":1,
+  "LV_USE_LOG":1,
+  "LV_THEME_LIVE_UPDATE":1,
+  "LV_USE_THEME_TEMPL":1,  
+  "LV_USE_THEME_DEFAULT":1, 
+  "LV_USE_THEME_ALIEN":1,   
+  "LV_USE_THEME_NIGHT":1,   
+  "LV_USE_THEME_MONO":1,   
+  "LV_USE_THEME_MATERIAL":1,   
+  "LV_USE_THEME_ZEN":1, 
+  "LV_USE_THEME_NEMO": 1,
+  "LV_FONT_ROBOTO_12":1,
+  "LV_FONT_ROBOTO_16":1,
+  "LV_FONT_ROBOTO_22":1,
+  "LV_FONT_ROBOTO_28":1,
+  "LV_FONT_ROBOTO_12_SUBPX":1,
+  "LV_FONT_ROBOTO_28_COMPRESSED":1,
+  "LV_FONT_UNSCII_8":1,
+  "LV_FONT_DEFAULT":"\\\"&lv_font_roboto_16\\\"",
+  "LV_USE_ARC":1,
+  "LV_USE_BAR":1,
+  "LV_USE_BTN":1,
+  "LV_USE_BTNM":1,
+  "LV_USE_CALENDAR":1,
+  "LV_USE_CANVAS":1,
+  "LV_USE_CB":1,
+  "LV_USE_CHART":1,
+  "LV_USE_CONT":1,
+  "LV_USE_CPICKER":1,
+  "LV_USE_DDLIST":1,
+  "LV_USE_GAUGE":1,
+  "LV_USE_IMG":1,
+  "LV_USE_IMGBTN":1,
+  "LV_USE_KB":1,
+  "LV_USE_LABEL":1,
+  "LV_USE_LED":1,
+  "LV_USE_LINE":1,
+  "LV_USE_LIST":1,
+  "LV_USE_LMETER":1,
+  "LV_USE_OBJMASK":1,
+  "LV_USE_MBOX":1,
+  "LV_USE_PAGE":1,
+  "LV_USE_PRELOAD":1,
+  "LV_USE_ROLLER":1,
+  "LV_USE_SLIDER":1,
+  "LV_USE_SPINBOX":1,
+  "LV_USE_SW":1,
+  "LV_USE_TA":1,
+  "LV_USE_TABLE":1,
+  "LV_USE_TABVIEW":1,
+  "LV_USE_TILEVIEW":1,
+  "LV_USE_WIN":1 
+}
+
+
+advanced_features = {
+  "LV_DPI":100,
+  "LV_MEM_SIZE":4*1024*1024,
+  "LV_MEM_CUSTOM":1,
+  "LV_HOR_RES_MAX":800,
+  "LV_VER_RES_MAX":480,
+  "LV_COLOR_DEPTH":16,
+  "LV_COLOR_SCREEN_TRANSP":1,
+  "LV_USE_GROUP":1,
+  "LV_USE_ANIMATION":1,
+  "LV_ANTIALAIS":1,
+  "LV_GPU":1,
+  "LV_USE_FILESYSTEM":1,
+  "LV_USE_USER_DATA":1,
+  "LV_IMG_CACHE_DEF_SIZE":32,
+  "LV_USE_LOG":1,
+  "LV_LOG_PRINTF":1,
+  "LV_USE_DEBUG":1,
+  "LV_USE_ASSERT_NULL":1,
+  "LV_USE_ASSERT_MEM":1,
+  "LV_USE_ASSERT_STR":1,
+  "LV_USE_ASSERT_OBJ":1,
+  "LV_USE_ASSERT_STYLE":1,
+  "LV_THEME_LIVE_UPDATE":1,
+  "LV_USE_THEME_TEMPL":1,  
+  "LV_USE_THEME_DEFAULT":1, 
+  "LV_USE_THEME_ALIEN":1,   
+  "LV_USE_THEME_NIGHT":1,   
+  "LV_USE_THEME_MONO":1,   
+  "LV_USE_THEME_MATERIAL":1,   
+  "LV_USE_THEME_ZEN":1, 
+  "LV_USE_THEME_NEMO": 1,
+  "LV_FONT_ROBOTO_12":1,
+  "LV_FONT_ROBOTO_16":1,
+  "LV_FONT_ROBOTO_22":1,
+  "LV_FONT_ROBOTO_28":1,
+  "LV_FONT_ROBOTO_12_SUBPX":1,
+  "LV_FONT_ROBOTO_28_COMPRESSED":1,
+  "LV_FONT_UNSCII_8":1,
+  "LV_FONT_DEFAULT":"\\\"&lv_font_roboto_16\\\"",
+  "LV_USE_BIDI": 1,
+  "LV_USE_OBJ_REALIGN": 1,
+  "LV_FONT_FMT_TXT_LARGE":1,
+  "LV_FONT_SUBPX_BGR":1,
+  "LV_USE_BIDI": 1,
+  "LV_USE_OBJ_REALIGN": 1,
+  "LV_USE_EXT_CLICK_AREA":"LV_EXT_CLICK_AREA_FULL",
+  "LV_USE_ARC":1,
+  "LV_USE_BAR":1,
+  "LV_USE_BTN":1,
+  "LV_USE_BTNM":1,
+  "LV_USE_CALENDAR":1,
+  "LV_USE_CANVAS":1,
+  "LV_USE_CB":1,
+  "LV_USE_CHART":1,
+  "LV_USE_CONT":1,
+  "LV_USE_CPICKER":1,
+  "LV_USE_DDLIST":1,
+  "LV_USE_GAUGE":1,
+  "LV_USE_IMG":1,
+  "LV_USE_IMGBTN":1,
+  "LV_USE_KB":1,
+  "LV_USE_LABEL":1,
+  "LV_USE_LED":1,
+  "LV_USE_LINE":1,
+  "LV_USE_LIST":1,
+  "LV_USE_LMETER":1,
+  "LV_USE_OBJMASK":1,
+  "LV_USE_MBOX":1,
+  "LV_USE_PAGE":1,
+  "LV_USE_PRELOAD":1,
+  "LV_USE_ROLLER":1,
+  "LV_USE_SLIDER":1,
+  "LV_USE_SPINBOX":1,
+  "LV_USE_SW":1,
+  "LV_USE_TA":1,
+  "LV_USE_TABLE":1,
+  "LV_USE_TABVIEW":1,
+  "LV_USE_TILEVIEW":1,
+  "LV_USE_WIN":1 
+}
+
+
+build("Minimal monochrome", minimal_monochrome)
+build("All objects, minimal features", all_obj_minimal_features)
+build("All objects, all features", all_obj_all_features)
+  
+
+
+
diff --git a/tests/lv_test_conf.h b/tests/lv_test_conf.h
new file mode 100644
index 000000000..faa940876
--- /dev/null
+++ b/tests/lv_test_conf.h
@@ -0,0 +1,46 @@
+/**
+ * @file lv_test_conf.h
+ *
+ */
+
+#ifndef LV_TEST_CONF_H
+#define LV_TEST_CONF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*********************
+ *      INCLUDES
+ *********************/
+
+/*********************
+ *      DEFINES
+ *********************/
+
+/**********************
+ *      TYPEDEFS
+ **********************/
+typedef int16_t lv_coord_t;
+typedef void * lv_disp_drv_user_data_t;             /*Type of user data in the display driver*/
+typedef void * lv_indev_drv_user_data_t;            /*Type of user data in the input device driver*/
+typedef void * lv_font_user_data_t;
+typedef void * lv_obj_user_data_t;
+typedef void * lv_anim_user_data_t;
+typedef void * lv_group_user_data_t;
+typedef void * lv_fs_drv_user_data_t;
+typedef void * lv_img_decoder_user_data_t;
+
+/**********************
+ * GLOBAL PROTOTYPES
+ **********************/
+
+/**********************
+ *      MACROS
+ **********************/
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /*LV_TEST_CONF_H*/
diff --git a/tests/test_main.c b/tests/test_main.c
new file mode 100644
index 000000000..f837fc069
--- /dev/null
+++ b/tests/test_main.c
@@ -0,0 +1,16 @@
+#include "../lvgl.h"
+#include <stdio.h>
+
+#if LV_BUILD_TEST
+
+int main(void)
+{
+    printf("Call lv_init...\n");
+    lv_init();
+
+    printf("Exit with success!\n");
+    return 0;
+}
+
+#endif
+