From df18a5f68cc228a7da240fb667e42bf197cd3bae Mon Sep 17 00:00:00 2001
From: Gabor Kiss-Vamosi <kisvegabor@gmail.com>
Date: Tue, 3 Dec 2024 17:18:20 +0100
Subject: [PATCH] fix(ebike-demo): make it compile with Arduino (#7397)

---
 demos/benchmark/lv_demo_benchmark.c     | 6 +-----
 demos/ebike/translations/lv_i18n.c      | 2 +-
 demos/ebike/translations/lv_i18n.h      | 2 +-
 demos/multilang/lv_demo_multilang.c     | 3 +--
 demos/render/lv_demo_render.c           | 2 +-
 examples/porting/osal/lv_example_osal.c | 2 +-
 src/indev/lv_indev_private.h            | 2 ++
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/demos/benchmark/lv_demo_benchmark.c b/demos/benchmark/lv_demo_benchmark.c
index da885e65a..f9f67070c 100644
--- a/demos/benchmark/lv_demo_benchmark.c
+++ b/demos/benchmark/lv_demo_benchmark.c
@@ -34,11 +34,7 @@
     #warning "It's recommended to have at least 128kB RAM for the benchmark"
 #endif
 
-#include "../../src/core/lv_global.h"
-
-#if LV_USE_PERF_MONITOR
-    #include "../../lvgl_private.h"
-#endif
+#include "../../lvgl_private.h"
 
 /**********************
  *      DEFINES
diff --git a/demos/ebike/translations/lv_i18n.c b/demos/ebike/translations/lv_i18n.c
index 768b37c76..af32c6793 100644
--- a/demos/ebike/translations/lv_i18n.c
+++ b/demos/ebike/translations/lv_i18n.c
@@ -1,5 +1,5 @@
 #include "./lv_i18n.h"
-#include "../../../src/stdlib/lv_string.h"
+#include "../../../lvgl.h"
 
 #if LV_USE_DEMO_EBIKE
 
diff --git a/demos/ebike/translations/lv_i18n.h b/demos/ebike/translations/lv_i18n.h
index eea79a29c..8d26f2355 100644
--- a/demos/ebike/translations/lv_i18n.h
+++ b/demos/ebike/translations/lv_i18n.h
@@ -5,7 +5,7 @@
 extern "C" {
 #endif
 
-#include "../../../src/lv_conf_internal.h"
+#include "../../../lvgl.h"
 #if LV_USE_DEMO_EBIKE
 
 #include LV_STDINT_INCLUDE
diff --git a/demos/multilang/lv_demo_multilang.c b/demos/multilang/lv_demo_multilang.c
index 8bf2de930..bc3b7518f 100644
--- a/demos/multilang/lv_demo_multilang.c
+++ b/demos/multilang/lv_demo_multilang.c
@@ -9,8 +9,7 @@
 #include "lv_demo_multilang.h"
 
 #if LV_USE_DEMO_MULTILANG
-
-#include "../../src/indev/lv_indev_scroll.h"
+#include "../../lvgl_private.h"
 
 /*********************
  *      DEFINES
diff --git a/demos/render/lv_demo_render.c b/demos/render/lv_demo_render.c
index a935c7d6f..ea52b6263 100644
--- a/demos/render/lv_demo_render.c
+++ b/demos/render/lv_demo_render.c
@@ -10,7 +10,7 @@
 
 #if LV_USE_DEMO_RENDER
 
-#include "../../src/core/lv_global.h"
+#include "../../lvgl_private.h"
 
 /*********************
  *      DEFINES
diff --git a/examples/porting/osal/lv_example_osal.c b/examples/porting/osal/lv_example_osal.c
index 83ca557c4..d9566d722 100644
--- a/examples/porting/osal/lv_example_osal.c
+++ b/examples/porting/osal/lv_example_osal.c
@@ -9,7 +9,7 @@
 #include "../../lv_examples.h"
 
 #if LV_BUILD_EXAMPLES
-#include "../../../src/osal/lv_os.h"
+#include "../../../lvgl_private.h"
 
 /*********************
  *      DEFINES
diff --git a/src/indev/lv_indev_private.h b/src/indev/lv_indev_private.h
index 830fd4de9..3d6576c71 100644
--- a/src/indev/lv_indev_private.h
+++ b/src/indev/lv_indev_private.h
@@ -15,6 +15,8 @@ extern "C" {
  *********************/
 #include "lv_indev.h"
 #include "../misc/lv_anim.h"
+#include "lv_indev_scroll.h"
+
 /*********************
  *      DEFINES
  *********************/