diff --git a/hal b/hal
new file mode 160000
index 000000000..597fd86a7
--- /dev/null
+++ b/hal
@@ -0,0 +1 @@
+Subproject commit 597fd86a782942df3ff7486da8a23831fe73681f
diff --git a/lv_app/lv_app.c b/lv_app/lv_app.c
index 6b062faaa..b5173143d 100644
--- a/lv_app/lv_app.c
+++ b/lv_app/lv_app.c
@@ -10,7 +10,7 @@
 
 #if LV_APP_ENABLE != 0
 #include <stdio.h>
-#include "misc/gfx/anim.h"
+#include "../misc/gfx/anim.h"
 #include "lvgl/lv_obj/lv_refr.h"
 
 
diff --git a/lv_app/lv_app_util/lv_app_notice.c b/lv_app/lv_app_util/lv_app_notice.c
index d49e7e7e2..e436e1233 100644
--- a/lv_app/lv_app_util/lv_app_notice.c
+++ b/lv_app/lv_app_util/lv_app_notice.c
@@ -12,7 +12,7 @@
 #include "../../lv_objx/lv_cont.h"
 #include "../../lv_objx/lv_label.h"
 
-#include "misc/gfx/anim.h"
+#include "../misc/gfx/anim.h"
 #include <stdio.h>
 
 /*********************
diff --git a/lv_appx/lv_app_ethernet.c b/lv_appx/lv_app_ethernet.c
index 64e49d4fc..d6526867a 100644
--- a/lv_appx/lv_app_ethernet.c
+++ b/lv_appx/lv_app_ethernet.c
@@ -11,7 +11,7 @@
 
 #include "../lv_app/lv_app_util/lv_app_kb.h"
 #include "hal/eth/eth.h"
-#include "misc/os/ptask.h"
+#include "../misc/os/ptask.h"
 #include "hal/systick/systick.h"
 #include <stdio.h>
 
diff --git a/lv_appx/lv_app_files.c b/lv_appx/lv_app_files.c
index 6645e9abb..af5608d33 100644
--- a/lv_appx/lv_app_files.c
+++ b/lv_appx/lv_app_files.c
@@ -10,7 +10,7 @@
 #if LV_APP_ENABLE != 0 && USE_LV_APP_FILES != 0
 
 #include <stdio.h>
-#include "misc/os/ptask.h"
+#include "../misc/os/ptask.h"
 #include "../lv_app/lv_app_util/lv_app_kb.h"
 #include "../lv_app/lv_app_util/lv_app_notice.h"
 
diff --git a/lv_appx/lv_app_gsm.c b/lv_appx/lv_app_gsm.c
index a60f7b8cd..6cfb0d93a 100644
--- a/lv_appx/lv_app_gsm.c
+++ b/lv_appx/lv_app_gsm.c
@@ -11,9 +11,9 @@
 
 #include "../lv_app/lv_app_util/lv_app_kb.h"
 #include "hal/gsm/gsm.h"
-#include "misc/os/ptask.h"
+#include "../misc/os/ptask.h"
 #include "hal/systick/systick.h"
-#include "misc/comm/gsmmng.h"
+#include "../misc/comm/gsmmng.h"
 #include <stdio.h>
 
 /*********************
diff --git a/lv_appx/lv_app_sysmon.c b/lv_appx/lv_app_sysmon.c
index c898ddee5..c0054509e 100644
--- a/lv_appx/lv_app_sysmon.c
+++ b/lv_appx/lv_app_sysmon.c
@@ -10,11 +10,11 @@
 #if LV_APP_ENABLE != 0 && USE_LV_APP_SYSMON != 0
 
 #include <stdio.h>
-#include "misc/os/ptask.h"
-#include "misc/os/idle.h"
+#include "../misc/os/ptask.h"
+#include "../misc/os/idle.h"
 #include "lvgl/lv_objx/lv_chart.h"
 #include "lvgl/lv_app/lv_app_util/lv_app_notice.h"
-#include "hal/systick/systick.h"
+#include "../hal/systick/systick.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_appx/lv_app_wifi.c b/lv_appx/lv_app_wifi.c
index 497c7139b..148893e03 100644
--- a/lv_appx/lv_app_wifi.c
+++ b/lv_appx/lv_app_wifi.c
@@ -11,10 +11,10 @@
 
 #include "../lv_app/lv_app_util/lv_app_kb.h"
 #include "hal/wifi/wifi.h"
-#include "misc/os/ptask.h"
+#include "../misc/os/ptask.h"
 #include "hal/systick/systick.h"
-#include "misc/comm/wifimng.h"
-#include "misc/fs/fat32/integer.h"
+#include "../misc/comm/wifimng.h"
+#include "../misc/fs/fat32/integer.h"
 #include <stdio.h>
 
 /*********************
diff --git a/lv_draw/lv_draw.c b/lv_draw/lv_draw.c
index b8f02483d..b8281bbfa 100644
--- a/lv_draw/lv_draw.c
+++ b/lv_draw/lv_draw.c
@@ -6,18 +6,18 @@
 /*********************
  *      INCLUDES
  *********************/
-#include <misc/gfx/circ.h>
 #include "lv_conf.h"
 
 #include <stdio.h>
 #include <stdbool.h>
-#include "misc/gfx/text.h"
 #include "lv_draw.h"
-#include "misc/fs/fsint.h"
-#include "misc/math/math_base.h"
 #include "lv_draw_rbasic.h"
 #include "lv_draw_vbasic.h"
-#include "misc/fs/ufs/ufs.h"
+#include "../misc/gfx/text.h"
+#include "../misc/gfx/circ.h"
+#include "../misc/fs/fsint.h"
+#include "../misc/math/math_base.h"
+#include "../misc/fs/ufs/ufs.h"
 #include "../lv_objx/lv_img.h"
 
 /*********************
diff --git a/lv_draw/lv_draw.h b/lv_draw/lv_draw.h
index 5c3d20673..c1856763f 100644
--- a/lv_draw/lv_draw.h
+++ b/lv_draw/lv_draw.h
@@ -14,7 +14,7 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "misc_conf.h"
-#include "misc/gfx/text.h"
+#include "../misc/gfx/text.h"
 #include "../lv_obj/lv_style.h"
 
 /*********************
diff --git a/lv_draw/lv_draw_rbasic.c b/lv_draw/lv_draw_rbasic.c
index d1c3ed294..a40db112c 100644
--- a/lv_draw/lv_draw_rbasic.c
+++ b/lv_draw/lv_draw_rbasic.c
@@ -8,8 +8,8 @@
  *********************/
 #include "lv_draw_rbasic.h"
 #include "lv_conf.h"
-#include "hal/disp/disp.h"
-#include "misc/gfx/font.h"
+#include "../hal/disp/hal_disp.h"
+#include "../misc/gfx/font.h"
 
 /*********************
  *      DEFINES
@@ -77,7 +77,7 @@ void lv_rfill(const area_t * cords_p, const area_t * mask_p,
         
     
     if(union_ok != false){
-    	disp_fill(masked_area.x1, masked_area.y1, masked_area.x2, masked_area.y2, color);
+    	//TODO disp_fill(masked_area.x1, masked_area.y1, masked_area.x2, masked_area.y2, color);
     }
 }
 
@@ -192,7 +192,7 @@ void lv_rmap(const area_t * cords_p, const area_t * mask_p,
         cord_t row;
         cord_t mask_w = area_get_width(&masked_a) - 1;
         for(row = 0; row < area_get_height(&masked_a); row++) {
-            disp_map(masked_a.x1, masked_a.y1 + row, masked_a.x1 + mask_w, masked_a.y1 + row, map_p);
+            //TODO disp_map(masked_a.x1, masked_a.y1 + row, masked_a.x1 + mask_w, masked_a.y1 + row, map_p);
 
             map_p += map_width;
         }
diff --git a/lv_draw/lv_draw_rbasic.h b/lv_draw/lv_draw_rbasic.h
index f26f9aa29..71ed01db0 100644
--- a/lv_draw/lv_draw_rbasic.h
+++ b/lv_draw/lv_draw_rbasic.h
@@ -13,9 +13,9 @@ extern "C" {
 /*********************
  *      INCLUDES
  *********************/
-#include "misc/gfx/color.h"
-#include "misc/gfx/area.h"
-#include "misc/gfx/font.h"
+#include "../misc/gfx/color.h"
+#include "../misc/gfx/area.h"
+#include "../misc/gfx/font.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_draw/lv_draw_vbasic.c b/lv_draw/lv_draw_vbasic.c
index d3f543c6e..f4e4b0948 100644
--- a/lv_draw/lv_draw_vbasic.c
+++ b/lv_draw/lv_draw_vbasic.c
@@ -7,10 +7,10 @@
 #include <string.h>
 
 #include "lv_conf.h"
-#include "misc/gfx/area.h"
-#include "misc/gfx/font.h"
-#include "misc/gfx/color.h"
-#include "hal/disp/disp.h"
+#include "../misc/gfx/area.h"
+#include "../misc/gfx/font.h"
+#include "../misc/gfx/color.h"
+#include "../hal/disp/hal_disp.h"
 
 #if LV_VDB_SIZE != 0
 
diff --git a/lv_draw/lv_draw_vbasic.h b/lv_draw/lv_draw_vbasic.h
index c347d18be..2f9f163bc 100644
--- a/lv_draw/lv_draw_vbasic.h
+++ b/lv_draw/lv_draw_vbasic.h
@@ -17,9 +17,9 @@ extern "C" {
 
 #if LV_VDB_SIZE != 0
 
-#include "misc/gfx/color.h"
-#include "misc/gfx/area.h"
-#include "misc/gfx/font.h"
+#include "../misc/gfx/color.h"
+#include "../misc/gfx/area.h"
+#include "../misc/gfx/font.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_obj/lv_dispi.c b/lv_obj/lv_dispi.c
index 27afa2ce9..b7aebb29d 100644
--- a/lv_obj/lv_dispi.c
+++ b/lv_obj/lv_dispi.c
@@ -8,12 +8,12 @@
  ********************/
 #include "lv_conf.h"
 
-#include "misc/os/ptask.h"
-#include "misc/math/math_base.h"
+#include "../misc/os/ptask.h"
+#include "../misc/math/math_base.h"
 #include "lv_dispi.h"
 #include "../lv_draw/lv_draw_rbasic.h"
-#include "hal/indev/indev.h"
-#include "hal/systick/systick.h"
+#include "../hal/indev/hal_indev.h"
+#include "../hal/systick/systick.h"
 #include "lv_obj.h"
 
 /*********************
@@ -41,7 +41,7 @@ static void dispi_drag_throw(lv_dispi_t * dispi_p);
 static ptask_t* dispi_task_p;
 static bool lv_dispi_reset_qry;
 static bool lv_dispi_reset_now;
-static lv_dispi_t dispi_array[INDEV_NUM];
+static lv_dispi_t dispi_array[2];
 
 /**********************
  *      MACROS
@@ -145,12 +145,14 @@ void lv_dispi_wait_release(lv_dispi_t * dispi)
  */
 static void dispi_task(void * param)
 {
+
+    return; //TODO
 	cord_t x;
 	cord_t y;
 	uint8_t i;
 
-	for (i = 0; i < INDEV_NUM; i++) {
-		dispi_array[i].pressed = indev_get(i, &x, &y);
+	for (i = 0; i < 1; i++) {
+	    //TODO dispi_array[i].pressed = indev_get(i, &x, &y);
 		dispi_proc_point(&dispi_array[i], x, y);
 	}
 
diff --git a/lv_obj/lv_obj.c b/lv_obj/lv_obj.c
index d71108b31..9b5471ea5 100644
--- a/lv_obj/lv_obj.c
+++ b/lv_obj/lv_obj.c
@@ -15,8 +15,8 @@
 #include "lv_refr.h"
 #include "lv_group.h"
 #include "../lv_app/lv_app.h"
-#include "misc/gfx/anim.h"
-#include "hal/indev/indev.h"
+#include "../misc/gfx/anim.h"
+#include "../hal/indev/hal_indev.h"
 #include <stdint.h>
 #include <string.h>
 
@@ -64,6 +64,8 @@ LV_IMG_DECLARE(LV_IMG_DEF_WALLPAPER);
  */
 void lv_init(void)
 {
+    misc_init();
+
     /*Clear the screen*/
     area_t scr_area;
     area_set(&scr_area, 0, 0, LV_HOR_RES, LV_VER_RES);
@@ -293,24 +295,25 @@ void lv_obj_del(lv_obj_t * obj)
     /*Delete the base objects*/
     if(obj->ext != NULL)  dm_free(obj->ext);
     dm_free(obj); /*Free the object itself*/
-    
-    /* Reset all display input (dispi) if
-     * the currently pressed object is deleted too*/
-    lv_dispi_t * dispi_array = lv_dispi_get_array();
-    lv_obj_t * dpar;
-    uint8_t d;
-    for(d = 0; d < INDEV_NUM; d++) {
-        dpar = obj;
-        while(dpar != NULL) {
-            if(dispi_array[d].act_obj == dpar ||
-               dispi_array[d].last_obj == dpar) {
-                lv_dispi_reset();
-                break;
-            } else {
-                dpar = lv_obj_get_parent(dpar);
-            }
-        }
-    }
+
+//     TODO Update with the new HAL
+//    /* Reset all display input (dispi) if
+//     * the currently pressed object is deleted too*/
+//    lv_dispi_t * dispi_array = lv_dispi_get_array();
+//    lv_obj_t * dpar;
+//    uint8_t d;
+//    for(d = 0; d < INDEV_NUM; d++) {
+//        dpar = obj;
+//        while(dpar != NULL) {
+//            if(dispi_array[d].act_obj == dpar ||
+//               dispi_array[d].last_obj == dpar) {
+//                lv_dispi_reset();
+//                break;
+//            } else {
+//                dpar = lv_obj_get_parent(dpar);
+//            }
+//        }
+//    }
 
     /*Send a signal to the parent to notify it about the child delete*/
     if(par != NULL) {
diff --git a/lv_obj/lv_obj.h b/lv_obj/lv_obj.h
index c0ff75490..36f3bd778 100644
--- a/lv_obj/lv_obj.h
+++ b/lv_obj/lv_obj.h
@@ -14,12 +14,12 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "lv_conf.h"
-#include <misc/gfx/area.h>
 #include <stddef.h>
 #include <stdbool.h>
-#include "misc/mem/dyn_mem.h"
-#include "misc/mem/linked_list.h"
-#include "misc/gfx/color.h"
+#include "../misc/gfx/area.h"
+#include "../misc/mem/dyn_mem.h"
+#include "../misc/mem/linked_list.h"
+#include "../misc/gfx/color.h"
 #include "lv_style.h"
 
 /*********************
diff --git a/lv_obj/lv_refr.c b/lv_obj/lv_refr.c
index 9216700be..4e43fa5c6 100644
--- a/lv_obj/lv_refr.c
+++ b/lv_obj/lv_refr.c
@@ -8,11 +8,11 @@
  *********************/
 #include <stddef.h>
 #include "lv_conf.h"
-#include "misc/os/ptask.h"
-#include "misc/mem/fifo.h"
+#include "../misc/os/ptask.h"
+#include "../misc/mem/fifo.h"
 #include "lv_refr.h"
 #include "lv_vdb.h"
-#include "hal/systick/systick.h"
+#include "../hal/systick/systick.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_obj/lv_style.c b/lv_obj/lv_style.c
index 65a3b0f1c..7cf233849 100644
--- a/lv_obj/lv_style.c
+++ b/lv_obj/lv_style.c
@@ -9,7 +9,7 @@
 #include "lv_conf.h"
 #include "lv_style.h"
 #include "lv_obj.h"
-#include "misc/mem/dyn_mem.h"
+#include "../misc/mem/dyn_mem.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_obj/lv_style.h b/lv_obj/lv_style.h
index a57c192af..3d4c80360 100644
--- a/lv_obj/lv_style.h
+++ b/lv_obj/lv_style.h
@@ -14,10 +14,10 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include <stdbool.h>
-#include "misc/gfx/color.h"
-#include "misc/gfx/area.h"
-#include "misc/gfx/font.h"
-#include "misc/gfx/anim.h"
+#include "../misc/gfx/color.h"
+#include "../misc/gfx/area.h"
+#include "../misc/gfx/font.h"
+#include "../misc/gfx/anim.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_obj/lv_vdb.c b/lv_obj/lv_vdb.c
index 7fd4ac760..7eb50502f 100644
--- a/lv_obj/lv_vdb.c
+++ b/lv_obj/lv_vdb.c
@@ -5,7 +5,7 @@
 #include "lv_conf.h"
 #if LV_VDB_SIZE != 0
 
-#include "hal/disp/disp.h"
+#include "../hal/disp/hal_disp.h"
 #include <stddef.h>
 #include "lv_vdb.h"
 
@@ -146,7 +146,7 @@ void lv_vdb_flush(void)
 
 	/* Now the full the VDB is filtered and the result is stored in the first quarter of it
 	 * Write out the filtered map to the display*/
-    disp_map(vdb_act->area.x1 >> 1, vdb_act->area.y1 >> 1, vdb_act->area.x2 >> 1, vdb_act->area.y2 >> 1, vdb_act->buf);
+	//TODO disp_map(vdb_act->area.x1 >> 1, vdb_act->area.y1 >> 1, vdb_act->area.x2 >> 1, vdb_act->area.y2 >> 1, vdb_act->buf);
 #endif
 }
 
diff --git a/lv_obj/lv_vdb.h b/lv_obj/lv_vdb.h
index 54a0facf6..0f2f9e742 100644
--- a/lv_obj/lv_vdb.h
+++ b/lv_obj/lv_vdb.h
@@ -17,8 +17,8 @@ extern "C" {
 
 #if LV_VDB_SIZE != 0
 
-#include "misc/gfx/color.h"
-#include "misc/gfx/area.h"
+#include "../misc/gfx/color.h"
+#include "../misc/gfx/area.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_bar.c b/lv_objx/lv_bar.c
index 805c0a080..5b1844c45 100644
--- a/lv_objx/lv_bar.c
+++ b/lv_objx/lv_bar.c
@@ -13,7 +13,7 @@
 
 #include "lv_bar.h"
 #include "../lv_draw/lv_draw.h"
-#include "misc/gfx/anim.h"
+#include "../misc/gfx/anim.h"
 #include <stdio.h>
 
 /*********************
diff --git a/lv_objx/lv_btn.c b/lv_objx/lv_btn.c
index ddfb22be7..27fa5c790 100644
--- a/lv_objx/lv_btn.c
+++ b/lv_objx/lv_btn.c
@@ -13,8 +13,8 @@
 #include "lv_btn.h"
 #include "../lv_obj/lv_group.h"
 #include "../lv_draw/lv_draw.h"
-#include "misc/gfx/area.h"
-#include "misc/gfx/color.h"
+#include "../misc/gfx/area.h"
+#include "../misc/gfx/color.h"
 #include <stdbool.h>
 #include <string.h>
 
diff --git a/lv_objx/lv_btnm.c b/lv_objx/lv_btnm.c
index aa19d5097..3b670d75d 100644
--- a/lv_objx/lv_btnm.c
+++ b/lv_objx/lv_btnm.c
@@ -13,7 +13,7 @@
 #include "../lv_obj/lv_group.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_obj/lv_refr.h"
-#include "misc/gfx/text.h"
+#include "../misc/gfx/text.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_cont.c b/lv_objx/lv_cont.c
index 793fb1447..80fe7b3ff 100644
--- a/lv_objx/lv_cont.c
+++ b/lv_objx/lv_cont.c
@@ -17,10 +17,10 @@
 #include "lv_cont.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_draw/lv_draw_vbasic.h"
-#include "misc/gfx/area.h"
+#include "../misc/gfx/area.h"
 
-#include "misc/gfx/color.h"
-#include "misc/math/math_base.h"
+#include "../misc/gfx/color.h"
+#include "../misc/math/math_base.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_ddlist.c b/lv_objx/lv_ddlist.c
index 80d57d85b..58065fc11 100644
--- a/lv_objx/lv_ddlist.c
+++ b/lv_objx/lv_ddlist.c
@@ -14,7 +14,7 @@
 #include "../lv_draw/lv_draw.h"
 #include "../lv_obj/lv_group.h"
 #include "../lv_obj/lv_dispi.h"
-#include "misc/gfx/anim.h"
+#include "../misc/gfx/anim.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_gauge.c b/lv_objx/lv_gauge.c
index 4252beb98..0ccec3fc1 100644
--- a/lv_objx/lv_gauge.c
+++ b/lv_objx/lv_gauge.c
@@ -12,9 +12,9 @@
 
 #include "lv_gauge.h"
 #include "../lv_draw/lv_draw.h"
-#include "misc/gfx/text.h"
-#include "misc/math/trigo.h"
-#include "misc/math/math_base.h"
+#include "../misc/gfx/text.h"
+#include "../misc/math/trigo.h"
+#include "../misc/math/math_base.h"
 #include <stdio.h>
 #include <string.h>
 
diff --git a/lv_objx/lv_img.c b/lv_objx/lv_img.c
index 62de520ff..cf1e61c88 100644
--- a/lv_objx/lv_img.c
+++ b/lv_objx/lv_img.c
@@ -12,11 +12,11 @@
 
 #include "lv_img.h"
 #include "../lv_draw/lv_draw.h"
-#include "misc/fs/fsint.h"
-#include "misc/fs/ufs/ufs.h"
+#include "../misc/fs/fsint.h"
+#include "../misc/fs/ufs/ufs.h"
 
 #if LV_IMG_ENABLE_SYMBOLS != 0
-#include "misc/gfx/text.h"
+#include "../misc/gfx/text.h"
 #endif
 
 /*********************
diff --git a/lv_objx/lv_img.h b/lv_objx/lv_img.h
index 7735bdbd9..c9d7213b7 100644
--- a/lv_objx/lv_img.h
+++ b/lv_objx/lv_img.h
@@ -18,7 +18,7 @@ extern "C" {
 #if USE_LV_IMG != 0 && USE_FSINT != 0
 
 #include "../lv_obj/lv_obj.h"
-#include "misc/fs/fsint.h"
+#include "../misc/fs/fsint.h"
 
 #ifndef LV_IMG_ENABLE_SYMBOLS
 #define LV_IMG_ENABLE_SYMBOLS 0
@@ -26,7 +26,7 @@ extern "C" {
 
 #if LV_IMG_ENABLE_SYMBOLS != 0
 #include "lv_label.h"
-#include "misc/gfx/fonts/symbol_def.h"
+#include "../misc/gfx/fonts/symbol_def.h"
 #endif
 
 /*********************
diff --git a/lv_objx/lv_label.c b/lv_objx/lv_label.c
index 305f0513d..e10d17e3a 100644
--- a/lv_objx/lv_label.c
+++ b/lv_objx/lv_label.c
@@ -9,13 +9,13 @@
 #include "lv_conf.h"
 #if USE_LV_LABEL != 0
 
-#include "misc/gfx/color.h"
-#include "misc/math/math_base.h"
+#include "../misc/gfx/color.h"
+#include "../misc/math/math_base.h"
 #include "lv_label.h"
 #include "../lv_obj/lv_obj.h"
 #include "../lv_obj/lv_group.h"
-#include "misc/gfx/text.h"
-#include "misc/gfx/anim.h"
+#include "../misc/gfx/text.h"
+#include "../misc/gfx/anim.h"
 #include "../lv_draw/lv_draw.h"
 
 /*********************
diff --git a/lv_objx/lv_label.h b/lv_objx/lv_label.h
index f5e84758d..2c5b5383e 100644
--- a/lv_objx/lv_label.h
+++ b/lv_objx/lv_label.h
@@ -17,8 +17,8 @@ extern "C" {
 #if USE_LV_LABEL != 0
 
 #include "../lv_obj/lv_obj.h"
-#include "misc/gfx/font.h"
-#include "misc/gfx/text.h"
+#include "../misc/gfx/font.h"
+#include "../misc/gfx/text.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_line.c b/lv_objx/lv_line.c
index 556416ace..2bb67ff4a 100644
--- a/lv_objx/lv_line.c
+++ b/lv_objx/lv_line.c
@@ -11,7 +11,7 @@
 #if USE_LV_LINE != 0
 #include "lv_line.h"
 #include "../lv_draw/lv_draw.h"
-#include "misc/math/math_base.h"
+#include "../misc/math/math_base.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/lv_objx/lv_list.c b/lv_objx/lv_list.c
index efcbe4fd6..c0f661528 100644
--- a/lv_objx/lv_list.c
+++ b/lv_objx/lv_list.c
@@ -12,8 +12,8 @@
 #include "lv_list.h"
 #include "../lv_obj/lv_group.h"
 #include "lv_cont.h"
-#include "misc/gfx/anim.h"
-#include "misc/math/math_base.h"
+#include "../misc/gfx/anim.h"
+#include "../misc/math/math_base.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_lmeter.c b/lv_objx/lv_lmeter.c
index ca5feb3f0..e9c75d599 100644
--- a/lv_objx/lv_lmeter.c
+++ b/lv_objx/lv_lmeter.c
@@ -10,7 +10,7 @@
 #if USE_LV_LMETER != 0
 
 #include "lv_lmeter.h"
-#include "misc/math/trigo.h"
+#include "../misc/math/trigo.h"
 #include "../lv_draw/lv_draw.h"
 
 /*********************
diff --git a/lv_objx/lv_mbox.c b/lv_objx/lv_mbox.c
index a414c6b7b..15211d35c 100644
--- a/lv_objx/lv_mbox.c
+++ b/lv_objx/lv_mbox.c
@@ -12,8 +12,8 @@
 
 #include "lv_mbox.h"
 #include "../lv_obj/lv_group.h"
-#include "misc/gfx/anim.h"
-#include "misc/math/math_base.h"
+#include "../misc/gfx/anim.h"
+#include "../misc/math/math_base.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_page.c b/lv_objx/lv_page.c
index 225cde101..f257087ff 100644
--- a/lv_objx/lv_page.c
+++ b/lv_objx/lv_page.c
@@ -9,13 +9,13 @@
 #include "lv_conf.h"
 #if USE_LV_PAGE != 0
 
-#include "misc/math/math_base.h"
+#include "../misc/math/math_base.h"
 #include "../lv_obj/lv_group.h"
 #include "../lv_objx/lv_page.h"
 #include "../lv_objx/lv_cont.h"
 #include "../lv_draw/lv_draw.h"
 #include "../lv_obj/lv_refr.h"
-#include "misc/gfx/anim.h"
+#include "../misc/gfx/anim.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_slider.c b/lv_objx/lv_slider.c
index b50f5d4b8..889894e89 100644
--- a/lv_objx/lv_slider.c
+++ b/lv_objx/lv_slider.c
@@ -12,7 +12,7 @@
 #include "lv_slider.h"
 #include "../lv_obj/lv_group.h"
 #include "../lv_draw/lv_draw.h"
-#include "misc/math/math_base.h"
+#include "../misc/math/math_base.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_ta.c b/lv_objx/lv_ta.c
index 1d4e962f0..f6eb81f84 100644
--- a/lv_objx/lv_ta.c
+++ b/lv_objx/lv_ta.c
@@ -13,7 +13,7 @@
 #include "lv_ta.h"
 #include "../lv_obj/lv_group.h"
 #include "../lv_draw/lv_draw.h"
-#include "misc/gfx/anim.h"
+#include "../misc/gfx/anim.h"
 
 /*********************
  *      DEFINES
diff --git a/lv_objx/lv_tabview.c b/lv_objx/lv_tabview.c
index d66ef2d57..a45049df8 100644
--- a/lv_objx/lv_tabview.c
+++ b/lv_objx/lv_tabview.c
@@ -11,7 +11,7 @@
 
 #include <lvgl/lv_objx/lv_tabview.h>
 #include "lv_btnm.h"
-#include "misc/gfx/anim.h"
+#include "../misc/gfx/anim.h"
 
 /*********************
  *      DEFINES
diff --git a/misc b/misc
index 3103b9107..e89a961bd 160000
--- a/misc
+++ b/misc
@@ -1 +1 @@
-Subproject commit 3103b91078906dfaf328c315ea82a731c11664d8
+Subproject commit e89a961bd1eb611019c759b78305a90ef7950ad9