diff --git a/src/lib/elementary/elm_image_legacy.h b/src/lib/elementary/elm_image_legacy.h
index 77286c9623..a53e063a5c 100644
--- a/src/lib/elementary/elm_image_legacy.h
+++ b/src/lib/elementary/elm_image_legacy.h
@@ -553,3 +553,5 @@ EAPI Eina_Bool elm_image_aspect_fixed_get(const Evas_Object *obj);
  * @ingroup Elm_Image
  */
 EAPI void elm_image_async_open_set(Evas_Object *obj, Eina_Bool async);
+
+#include "efl_ui_image.eo.legacy.h"
diff --git a/src/lib/elementary/elm_layout_legacy.h b/src/lib/elementary/elm_layout_legacy.h
index fb90fb0d4b..58dab5bcc9 100644
--- a/src/lib/elementary/elm_layout_legacy.h
+++ b/src/lib/elementary/elm_layout_legacy.h
@@ -712,5 +712,4 @@ EAPI const char *elm_layout_part_cursor_style_get(const Evas_Object *obj, const
  */
 EAPI Eina_Bool elm_layout_part_cursor_unset(Evas_Object *obj, const char *part_name);
 
-/* FIXME: this shouldn't have to be included but causes build errors otherwise */
 #include "efl_ui_layout.eo.legacy.h"
diff --git a/src/lib/elementary/elm_progressbar_legacy.h b/src/lib/elementary/elm_progressbar_legacy.h
index a6b67991be..8eedf940e5 100644
--- a/src/lib/elementary/elm_progressbar_legacy.h
+++ b/src/lib/elementary/elm_progressbar_legacy.h
@@ -284,3 +284,5 @@ EAPI void elm_progressbar_part_value_set(Evas_Object *obj, const char *part, dou
  * @ingroup Elm_Progressbar
  */
 EAPI double elm_progressbar_part_value_get(const Evas_Object *obj, const char *part);
+
+#include "efl_ui_progressbar.eo.legacy.h"
diff --git a/src/lib/elementary/elm_scroller_legacy.h b/src/lib/elementary/elm_scroller_legacy.h
index 2e0cec9c17..6b40eff78f 100644
--- a/src/lib/elementary/elm_scroller_legacy.h
+++ b/src/lib/elementary/elm_scroller_legacy.h
@@ -1,42 +1,4 @@
-#ifndef _ELM_INTERFACE_SCROLLABLE_EO_TYPES
-#define _ELM_INTERFACE_SCROLLABLE_EO_TYPES
-
-/**
- * @brief Type that controls when scrollbars should appear.
- *
- * See also @ref Elm.Interface_Scrollable.policy.set.
- *
- * @ingroup Elm_Scroller
- */
-typedef enum
-{
-  ELM_SCROLLER_POLICY_AUTO = 0, /**< Show scrollbars as needed */
-  ELM_SCROLLER_POLICY_ON, /**< Always show scrollbars */
-  ELM_SCROLLER_POLICY_OFF, /**< Never show scrollbars */
-  ELM_SCROLLER_POLICY_LAST /**< Sentinel value to indicate last enum field
-                            * during iteration */
-} Elm_Scroller_Policy;
-
-/**
- * @brief Type that controls how the content is scrolled.
- *
- * See also @ref Elm.Interface_Scrollable.single_direction.set.
- *
- * @ingroup Elm_Scroller
- */
-typedef enum
-{
-  ELM_SCROLLER_SINGLE_DIRECTION_NONE = 0, /**< Scroll every direction */
-  ELM_SCROLLER_SINGLE_DIRECTION_SOFT, /**< Scroll single direction if the
-                                       * direction is certain */
-  ELM_SCROLLER_SINGLE_DIRECTION_HARD, /**< Scroll only single direction */
-  ELM_SCROLLER_SINGLE_DIRECTION_LAST /**< Sentinel value to indicate last enum
-                                      * field during iteration */
-} Elm_Scroller_Single_Direction;
-
-
-#endif
-
+#include "elm_interface_scrollable.eo.legacy.h"
 #include "elm_scroller_eo.legacy.h"
 
 /**
diff --git a/src/lib/elementary/elm_slider_legacy.h b/src/lib/elementary/elm_slider_legacy.h
index aa32dec6b1..99c5097297 100644
--- a/src/lib/elementary/elm_slider_legacy.h
+++ b/src/lib/elementary/elm_slider_legacy.h
@@ -381,3 +381,5 @@ EAPI double elm_slider_step_get(const Evas_Object *obj);
  * @ingroup Elm_Slider
  */
 EAPI void elm_slider_step_set(Evas_Object *obj, double step);
+
+#include "efl_ui_slider.eo.legacy.h"
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index cf790d390c..6347b0cf7f 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -3526,6 +3526,8 @@ EWAPI Eina_Bool _evas_object_intercept_call(Evas_Object *obj, Evas_Object_Interc
  */
 EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
 
+#include "canvas/efl_canvas_rectangle.eo.legacy.h"
+
 /**
  * @}
  */
@@ -4295,6 +4297,8 @@ EAPI void evas_vg_gradient_spread_set(Eo *obj, Efl_Gfx_Gradient_Spread s);
  */
 EAPI Efl_Gfx_Gradient_Spread evas_vg_gradient_spread_get(Eo *obj);
 
+#include "canvas/efl_canvas_vg_gradient.eo.legacy.h"
+
 /**
  * Creates a new linear gradient object \.
  *
@@ -4344,6 +4348,8 @@ EAPI void evas_vg_gradient_linear_end_set(Eo *obj, double x, double y);
  */
 EAPI void evas_vg_gradient_linear_end_get(Eo *obj, double *x, double *y);
 
+#include "canvas/efl_canvas_vg_gradient_linear.eo.legacy.h"
+
 /**
  * Creates a new radial gradient object \.
  *
@@ -4410,6 +4416,8 @@ EAPI void evas_vg_gradient_radial_focal_set(Eo *obj, double x, double y);
  */
 EAPI void evas_vg_gradient_radial_focal_get(Eo *obj, double *x, double *y);
 
+#include "canvas/efl_canvas_vg_gradient_radial.eo.legacy.h"
+
 /**
  * @}
  */
@@ -8042,6 +8050,8 @@ EAPI void evas_object_map_enable_set(Evas_Object *obj, Eina_Bool enabled);
  */
 EAPI Eina_Bool evas_object_map_enable_get(const Evas_Object *obj);
 
+#include "canvas/efl_gfx_mapping.eo.legacy.h"
+
 /**
  * @brief Apply an evas filter program on this text object.
  *
@@ -8159,3 +8169,15 @@ EAPI void evas_object_freeze_events_set(Efl_Canvas_Object *obj, Eina_Bool freeze
  * @ingroup Evas_Object_Group
  */
 EAPI Eina_Bool evas_object_freeze_events_get(const Efl_Canvas_Object *obj);
+
+#include "canvas/efl_canvas_event_grabber_eo.legacy.h"
+
+#include "canvas/efl_canvas_animation_alpha.eo.legacy.h"
+#include "canvas/efl_canvas_animation.eo.legacy.h"
+#include "canvas/efl_canvas_animation_group.eo.legacy.h"
+#include "canvas/efl_canvas_animation_group_parallel.eo.legacy.h"
+#include "canvas/efl_canvas_animation_group_sequential.eo.legacy.h"
+#include "canvas/efl_canvas_animation_player.eo.legacy.h"
+#include "canvas/efl_canvas_animation_rotate.eo.legacy.h"
+#include "canvas/efl_canvas_animation_scale.eo.legacy.h"
+#include "canvas/efl_canvas_animation_translate.eo.legacy.h"