diff --git a/scripts/style_api_gen.py b/scripts/style_api_gen.py
index d3dca91081..248fc0523e 100755
--- a/scripts/style_api_gen.py
+++ b/scripts/style_api_gen.py
@@ -481,6 +481,9 @@ def docs(p):
 base_dir = os.path.abspath(os.path.dirname(__file__))
 sys.stdout = open(base_dir + '/../src/core/lv_obj_style_gen.h', 'w')
 
+print("#include \"../misc/lv_area.h\"")
+print("#include \"../misc/lv_style.h\"")
+print("#include \"../core/lv_obj_style.h\"")
 for p in props:
   obj_style_get(p)
 
diff --git a/src/core/lv_event.h b/src/core/lv_event.h
index 20385fee9f..d2c456186a 100644
--- a/src/core/lv_event.h
+++ b/src/core/lv_event.h
@@ -14,6 +14,10 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include <stdbool.h>
+#include "../misc/lv_area.h"
+#include "lv_obj_draw.h"
+#include "lv_obj_class.h"
+#include "../hal/lv_hal_indev.h"
 
 /*********************
  *      DEFINES
diff --git a/src/core/lv_obj_class.h b/src/core/lv_obj_class.h
index 7ed321f815..123adb6fe3 100644
--- a/src/core/lv_obj_class.h
+++ b/src/core/lv_obj_class.h
@@ -15,6 +15,7 @@ extern "C" {
  *********************/
 #include <stdint.h>
 #include <stdbool.h>
+#include "../misc/lv_area.h"
 
 /*********************
  *      DEFINES
diff --git a/src/core/lv_obj_style.h b/src/core/lv_obj_style.h
index b2feaa145d..711fe2b740 100644
--- a/src/core/lv_obj_style.h
+++ b/src/core/lv_obj_style.h
@@ -16,6 +16,7 @@ extern "C" {
 #include <stdint.h>
 #include <stdbool.h>
 #include "../misc/lv_bidi.h"
+#include "../misc/lv_style.h"
 
 /*********************
  *      DEFINES
@@ -26,6 +27,8 @@ extern "C" {
  **********************/
 /*Can't include lv_obj.h because it includes this header file*/
 struct _lv_obj_t;
+typedef uint32_t lv_part_t;
+typedef uint16_t lv_state_t;
 
 typedef enum {
     _LV_STYLE_STATE_CMP_SAME,           /*The style properties in the 2 states are identical*/
diff --git a/src/core/lv_obj_style_gen.h b/src/core/lv_obj_style_gen.h
index 576927d9aa..51bd6d3cd5 100644
--- a/src/core/lv_obj_style_gen.h
+++ b/src/core/lv_obj_style_gen.h
@@ -1,3 +1,6 @@
+#include "../misc/lv_area.h"
+#include "../misc/lv_style.h"
+#include "../core/lv_obj_style.h"
 static inline lv_coord_t lv_obj_get_style_width(const struct _lv_obj_t * obj, uint32_t part)
 {
     lv_style_value_t v = lv_obj_get_style_prop(obj, part, LV_STYLE_WIDTH);
diff --git a/src/core/lv_obj_tree.h b/src/core/lv_obj_tree.h
index bee9e1604e..9c28d64556 100644
--- a/src/core/lv_obj_tree.h
+++ b/src/core/lv_obj_tree.h
@@ -15,6 +15,8 @@ extern "C" {
  *********************/
 #include <stddef.h>
 #include <stdbool.h>
+#include "../misc/lv_anim.h"
+#include "../hal/lv_hal_disp.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/lv_draw_layer.h b/src/draw/lv_draw_layer.h
index cd64149c42..13896cb281 100644
--- a/src/draw/lv_draw_layer.h
+++ b/src/draw/lv_draw_layer.h
@@ -14,6 +14,8 @@ extern "C" {
  *      INCLUDES
  *********************/
 #include "../lv_conf_internal.h"
+#include "../misc/lv_area.h"
+#include "lv_draw_img.h"
 
 /*********************
  *      DEFINES
diff --git a/src/draw/lv_draw_transform.h b/src/draw/lv_draw_transform.h
index 1926c2fc24..548b2d2631 100644
--- a/src/draw/lv_draw_transform.h
+++ b/src/draw/lv_draw_transform.h
@@ -15,6 +15,7 @@ extern "C" {
  *********************/
 #include "../lv_conf_internal.h"
 #include "../misc/lv_area.h"
+#include "lv_draw_img.h"
 
 /*********************
  *      DEFINES