diff --git a/src/hal/lv_hal_indev.h b/src/hal/lv_hal_indev.h
index 21468e412..bd1004f26 100644
--- a/src/hal/lv_hal_indev.h
+++ b/src/hal/lv_hal_indev.h
@@ -176,7 +176,7 @@ typedef struct _lv_indev_t {
     lv_indev_drv_t * driver;
     _lv_indev_proc_t proc;
     struct _lv_obj_t * cursor;     /**< Cursor for LV_INPUT_TYPE_POINTER*/
-    struct _lv_group_t * group;    /**< Keypad destination group*/
+    struct lv_group_t_struct * group;    /**< Keypad destination group*/
     const lv_point_t * btn_points; /**< Array points assigned to the button ()screen will be pressed
                                       here by the buttons*/
 } _lv_indev_t;
diff --git a/tests/lv_test_main.c b/tests/lv_test_main.c
index cfe5f4478..7e2e3fb2c 100644
--- a/tests/lv_test_main.c
+++ b/tests/lv_test_main.c
@@ -29,7 +29,7 @@ int main(void)
     return 0;
 }
 
-static void * open_cb(struct _lv_fs_drv_t * drv, const char * path, lv_fs_mode_t mode)
+static void * open_cb(lv_fs_drv_t * drv, const char * path, lv_fs_mode_t mode)
 {
     (void) drv;
     (void) mode;
@@ -39,7 +39,7 @@ static void * open_cb(struct _lv_fs_drv_t * drv, const char * path, lv_fs_mode_t
     return fp;
 }
 
-static lv_fs_res_t close_cb(struct _lv_fs_drv_t * drv, void * file_p)
+static lv_fs_res_t close_cb(lv_fs_drv_t * drv, void * file_p)
 {
     (void) drv;
 
@@ -47,7 +47,7 @@ static lv_fs_res_t close_cb(struct _lv_fs_drv_t * drv, void * file_p)
     return LV_FS_RES_OK;
 }
 
-static lv_fs_res_t read_cb(struct _lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br)
+static lv_fs_res_t read_cb(lv_fs_drv_t * drv, void * file_p, void * buf, uint32_t btr, uint32_t * br)
 {
     (void) drv;
 
@@ -55,7 +55,7 @@ static lv_fs_res_t read_cb(struct _lv_fs_drv_t * drv, void * file_p, void * buf,
     return (*br <= 0) ? LV_FS_RES_UNKNOWN : LV_FS_RES_OK;
 }
 
-static lv_fs_res_t seek_cb(struct _lv_fs_drv_t * drv, void * file_p, uint32_t pos, lv_fs_whence_t w)
+static lv_fs_res_t seek_cb(lv_fs_drv_t * drv, void * file_p, uint32_t pos, lv_fs_whence_t w)
 {
     (void) drv;
 
@@ -79,7 +79,7 @@ static lv_fs_res_t seek_cb(struct _lv_fs_drv_t * drv, void * file_p, uint32_t po
     return LV_FS_RES_OK;
 }
 
-static lv_fs_res_t tell_cb(struct _lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
+static lv_fs_res_t tell_cb(lv_fs_drv_t * drv, void * file_p, uint32_t * pos_p)
 {
     (void) drv;