diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index 366222da73..93d05571bd 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -315,6 +315,8 @@ typedef Eo Efl_Ui_Spotlight_Indicator;
 # include <efl_ui_tab_pager.eo.h>
 # include <efl_ui_select_model.eo.h>
 # include <efl_ui_view_model.eo.h>
+# include <efl_ui_calendar.eo.h>
+
 /**
  * Initialize Elementary
  *
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index 3de15d7b4c..578f163d14 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -214,7 +214,6 @@ typedef Eo Efl_Ui_Focus_Manager;
 #include <elm_calendar.h>
 /* this is elm_animation_view */
 #include <efl_ui_animation_view.h>
-#include <efl_ui_calendar.h>
 #include <elm_check.h>
 #include <elm_clock.h>
 #include <elm_cnp.h>
diff --git a/src/lib/elementary/efl_ui_calendar.h b/src/lib/elementary/efl_ui_calendar.h
deleted file mode 100644
index c3c8f6ae89..0000000000
--- a/src/lib/elementary/efl_ui_calendar.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * @defgroup Elm_Calendar Calendar
- * @ingroup Elementary
- *
- * @image html calendar_inheritance_tree.png
- * @image latex calendar_inheritance_tree.eps
- *
- * This is a calendar widget. It helps applications to flexibly
- * display a calendar with day of the week, date, year and
- * month. Applications are able to set specific dates to be reported
- * back, when selected, in the smart callbacks of the calendar
- * widget. The API of this widget lets the applications perform other
- * functions, like:
- *
- * - placing marks on specific dates
- * - setting the bounds for the calendar (minimum and maximum years)
- * - setting the day names of the week (e.g. "Thu" or "Thursday")
- * - setting the year and month format.
- *
- * This widget inherits from the @ref Layout one, so that all the
- * functions acting on it also work for calendar objects.
- *
- * This widget emits the following signals, besides the ones sent from
- * @ref Layout:
- * - @c "changed" - emitted when the date in the calendar is changed.
- * - @c "display,changed" - emitted when the current month displayed in the
- * calendar is changed.
- * - @c "focused" - When the calendar has received focus. (since 1.8)
- * - @c "unfocused" - When the calendar has lost focus. (since 1.8)
- * - @c "language,changed" - the program's language changed (since 1.9)
- *
- * Supported elm_object common APIs.
- * @li @ref elm_object_signal_emit
- * @li @ref elm_object_signal_callback_add
- * @li @ref elm_object_signal_callback_del
- *
- * Here is some sample code using it:
- * @li @ref calendar_example_01
- * @li @ref calendar_example_02
- * @li @ref calendar_example_03
- * @li @ref calendar_example_04
- * @li @ref calendar_example_05
- * @li @ref calendar_example_06
- */
-
-/**
- * @addtogroup Elm_Calendar
- * @{
- */
-
-#include "efl_ui_calendar.eo.h"
-
-/**
- * @}
- */
diff --git a/src/lib/elementary/elm_calendar.h b/src/lib/elementary/elm_calendar.h
index ea95fb7207..9901f64154 100644
--- a/src/lib/elementary/elm_calendar.h
+++ b/src/lib/elementary/elm_calendar.h
@@ -50,6 +50,7 @@
 
 #include "elm_calendar_common.h"
 #ifndef EFL_NOLEGACY_API_SUPPORT
+#include "elm_calendar_eo.legacy.h"
 #include "elm_calendar_legacy.h"
 #endif
 /**
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 12e2f04355..323d14576c 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -426,7 +426,6 @@ elementary_pub_headers = [
   'elm_calendar.h',
   'elm_calendar_legacy.h',
   'elm_calendar_common.h',
-  'efl_ui_calendar.h',
   'elm_check.h',
   'efl_ui_check_eo.h',
   'elm_check_legacy.h',