diff --git a/components/lvgl_esp32_drivers/lvgl_i2c_conf.h b/components/lvgl_esp32_drivers/lvgl_i2c_conf.h
index 34c80b5f..cf8ac45e 100644
--- a/components/lvgl_esp32_drivers/lvgl_i2c_conf.h
+++ b/components/lvgl_esp32_drivers/lvgl_i2c_conf.h
@@ -12,7 +12,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 
 /*********************
  *      DEFINES
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/EVE_config.h b/components/lvgl_esp32_drivers/lvgl_tft/EVE_config.h
index 56a5cf5e..53225a23 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/EVE_config.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/EVE_config.h
@@ -35,7 +35,11 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR TH
 #ifndef EVE_CONFIG_H_
 #define EVE_CONFIG_H_
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 #include "../lvgl_spi_conf.h"
 
 #include "FT81x.h"
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/FT81x.h b/components/lvgl_esp32_drivers/lvgl_tft/FT81x.h
index f638171b..96366dff 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/FT81x.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/FT81x.h
@@ -3,7 +3,11 @@
 
 #include <stdint.h>
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 #include "../lvgl_helpers.h"
 
 void FT81x_init(void);
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/GC9A01.h b/components/lvgl_esp32_drivers/lvgl_tft/GC9A01.h
index 28028b58..d462c8d4 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/GC9A01.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/GC9A01.h
@@ -15,7 +15,11 @@ extern "C" {
  *********************/
 #include <stdbool.h>
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 #include "../lvgl_helpers.h"
 
 /*********************
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/disp_driver.h b/components/lvgl_esp32_drivers/lvgl_tft/disp_driver.h
index 8bd1d435..1ee33c7a 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/disp_driver.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/disp_driver.h
@@ -12,7 +12,11 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 
 #if defined CONFIG_LV_TFT_DISPLAY_CONTROLLER_ILI9341
 #include "ili9341.h"
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/disp_spi.c b/components/lvgl_esp32_drivers/lvgl_tft/disp_spi.c
index b5f7efbe..0e4e5486 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/disp_spi.c
+++ b/components/lvgl_esp32_drivers/lvgl_tft/disp_spi.c
@@ -19,7 +19,11 @@
 #include <freertos/semphr.h>
 #include <freertos/task.h>
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 
 #include "disp_spi.h"
 #include "disp_driver.h"
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/hx8357.h b/components/lvgl_esp32_drivers/lvgl_tft/hx8357.h
index feb659e1..dc51532d 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/hx8357.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/hx8357.h
@@ -25,7 +25,11 @@ extern "C" {
 #include <stdbool.h>
 #include <stdint.h>
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 #include "../lvgl_helpers.h"
 
  /*********************
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/il3820.h b/components/lvgl_esp32_drivers/lvgl_tft/il3820.h
index a57084bd..15ff090d 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/il3820.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/il3820.h
@@ -11,7 +11,11 @@ extern "C"
 {
 #endif
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 #include "sdkconfig.h"
 
 /* Values for Waveshare 2.9inch e-Paper Module, this values shouldn't be
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ili9341.h b/components/lvgl_esp32_drivers/lvgl_tft/ili9341.h
index 4dc0529d..4beb4f32 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/ili9341.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/ili9341.h
@@ -15,7 +15,11 @@ extern "C" {
  *********************/
 #include <stdbool.h>
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 #include "../lvgl_helpers.h"
 
 /*********************
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ili9481.h b/components/lvgl_esp32_drivers/lvgl_tft/ili9481.h
index 990967c8..79321908 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/ili9481.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/ili9481.h
@@ -15,7 +15,11 @@ extern "C" {
 #include <stdbool.h>
 #include <stdint.h>
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 #include "../lvgl_helpers.h"
 
 /*********************
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ili9486.h b/components/lvgl_esp32_drivers/lvgl_tft/ili9486.h
index dca06f4d..f65dd801 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/ili9486.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/ili9486.h
@@ -15,7 +15,11 @@ extern "C" {
  *********************/
 #include <stdbool.h>
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 #include "../lvgl_helpers.h"
 
 /*********************
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ili9488.h b/components/lvgl_esp32_drivers/lvgl_tft/ili9488.h
index 2284e1df..45a70454 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/ili9488.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/ili9488.h
@@ -15,7 +15,11 @@ extern "C" {
 #include <stdbool.h>
 #include <stdint.h>
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 #include "../lvgl_helpers.h"
 
 /*********************
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/jd79653a.h b/components/lvgl_esp32_drivers/lvgl_tft/jd79653a.h
index 23c5abc2..6a2065a8 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/jd79653a.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/jd79653a.h
@@ -11,7 +11,11 @@ extern "C"
 {
 #endif
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 
 void jd79653a_init();
 void jd79653a_deep_sleep();
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ra8875.h b/components/lvgl_esp32_drivers/lvgl_tft/ra8875.h
index 2cffd24d..a6d1fe5d 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/ra8875.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/ra8875.h
@@ -15,7 +15,11 @@ extern "C" {
  *********************/
 #include <stdbool.h>
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 
 /*********************
  *      DEFINES
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/sh1107.h b/components/lvgl_esp32_drivers/lvgl_tft/sh1107.h
index 523d65da..7a0db68b 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/sh1107.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/sh1107.h
@@ -15,7 +15,11 @@ extern "C" {
  *********************/
 #include <stdbool.h>
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 #include "../lvgl_helpers.h"
 
 /*********************
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/ssd1306.h b/components/lvgl_esp32_drivers/lvgl_tft/ssd1306.h
index 81212807..f859a76b 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/ssd1306.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/ssd1306.h
@@ -15,7 +15,11 @@ extern "C" {
  *********************/
 #include <stdbool.h>
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 #include "../lvgl_helpers.h"
 
 /*********************
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/st7735s.h b/components/lvgl_esp32_drivers/lvgl_tft/st7735s.h
index 68d21af1..03672ee5 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/st7735s.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/st7735s.h
@@ -14,7 +14,11 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include <stdbool.h>
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 
 /*********************
  *      DEFINES
diff --git a/components/lvgl_esp32_drivers/lvgl_tft/st7789.h b/components/lvgl_esp32_drivers/lvgl_tft/st7789.h
index 048dbd94..1136562b 100644
--- a/components/lvgl_esp32_drivers/lvgl_tft/st7789.h
+++ b/components/lvgl_esp32_drivers/lvgl_tft/st7789.h
@@ -12,7 +12,11 @@ extern "C"
 {
 #endif
 
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 #include "../lvgl_helpers.h"
 
 #include "sdkconfig.h"
diff --git a/components/lvgl_esp32_drivers/lvgl_touch/FT81x.h b/components/lvgl_esp32_drivers/lvgl_touch/FT81x.h
index d1881abd..c7887702 100644
--- a/components/lvgl_esp32_drivers/lvgl_touch/FT81x.h
+++ b/components/lvgl_esp32_drivers/lvgl_touch/FT81x.h
@@ -15,7 +15,11 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 
 /*********************
  *      DEFINES
diff --git a/components/lvgl_esp32_drivers/lvgl_touch/adcraw.h b/components/lvgl_esp32_drivers/lvgl_touch/adcraw.h
index ef20ec92..5c555ccc 100644
--- a/components/lvgl_esp32_drivers/lvgl_touch/adcraw.h
+++ b/components/lvgl_esp32_drivers/lvgl_touch/adcraw.h
@@ -13,7 +13,11 @@ extern "C" {
 #include <stdbool.h>
 #include "driver/gpio.h"
 #include "driver/adc.h"
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 
 #define TOUCHSCREEN_RESISTIVE_PIN_YU CONFIG_LV_TOUCHSCREEN_RESSITIVE_PIN_YU // Y+ any gpio
 #define TOUCHSCREEN_RESISTIVE_PIN_YD CONFIG_LV_TOUCHSCREEN_RESISTIVE_PIN_YD // Y- also ADC
diff --git a/components/lvgl_esp32_drivers/lvgl_touch/ra8875_touch.h b/components/lvgl_esp32_drivers/lvgl_touch/ra8875_touch.h
index d30b10f2..7d112d3a 100644
--- a/components/lvgl_esp32_drivers/lvgl_touch/ra8875_touch.h
+++ b/components/lvgl_esp32_drivers/lvgl_touch/ra8875_touch.h
@@ -15,7 +15,11 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 
 /*********************
  *      DEFINES
diff --git a/components/lvgl_esp32_drivers/lvgl_touch/stmpe610.h b/components/lvgl_esp32_drivers/lvgl_touch/stmpe610.h
index b19cd627..153a6e71 100644
--- a/components/lvgl_esp32_drivers/lvgl_touch/stmpe610.h
+++ b/components/lvgl_esp32_drivers/lvgl_touch/stmpe610.h
@@ -15,7 +15,11 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 
 /*********************
  *      DEFINES
diff --git a/components/lvgl_esp32_drivers/lvgl_touch/touch_driver.h b/components/lvgl_esp32_drivers/lvgl_touch/touch_driver.h
index aa2a8ff8..bc92f4fe 100644
--- a/components/lvgl_esp32_drivers/lvgl_touch/touch_driver.h
+++ b/components/lvgl_esp32_drivers/lvgl_touch/touch_driver.h
@@ -14,7 +14,11 @@ extern "C" {
  *********************/
 #include <stdint.h>
 #include <stdbool.h>
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 
 #if defined (CONFIG_LV_TOUCH_CONTROLLER_XPT2046)
 #include "xpt2046.h"
diff --git a/components/lvgl_esp32_drivers/lvgl_touch/xpt2046.h b/components/lvgl_esp32_drivers/lvgl_touch/xpt2046.h
index 35e88883..8d61ce83 100644
--- a/components/lvgl_esp32_drivers/lvgl_touch/xpt2046.h
+++ b/components/lvgl_esp32_drivers/lvgl_touch/xpt2046.h
@@ -16,7 +16,11 @@ extern "C" {
 
 #include <stdint.h>
 #include <stdbool.h>
+#ifdef LV_LVGL_H_INCLUDE_SIMPLE
+#include "lvgl.h"
+#else
 #include "lvgl/lvgl.h"
+#endif
 
 /*********************
  *      DEFINES