elm: include those headers in Elementary.h

src/lib/elementary/Elementary.h

@@ -152,6 +152,8 @@ EAPI extern Elm_Version *elm_version;
 # include "efl_ui_focus_user.eo.h"
 # include <efl_ui_textpath.eo.h>
 # include <efl_ui_translatable.eo.h>
+# include <efl_ui_focus_composition.eo.h>
+# include <efl_ui_focus_layer.eo.h>
 #endif
 
 #include <elm_tooltip.h>

src/lib/elementary/efl_ui_focus_composition.c

@@ -4,7 +4,6 @@
 
 #include <Elementary.h>
 #include "elm_priv.h"
-#include "efl_ui_focus_composition.eo.h"
 #include "efl_ui_focus_composition_adapter.eo.h"
 
 #define MY_CLASS EFL_UI_FOCUS_COMPOSITION_MIXIN

src/lib/elementary/efl_ui_focus_layer.c

@@ -6,7 +6,6 @@
 
 #include <Elementary.h>
 #include "elm_priv.h"
-#include "efl_ui_focus_layer.eo.h"
 
 #define MY_CLASS EFL_UI_FOCUS_LAYER_MIXIN
 

src/lib/elementary/elm_calendar.c

@@ -9,7 +9,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 #include "elm_widget_calendar.h"
-#include "efl_ui_focus_composition.eo.h"
 #include "elm_calendar_item.eo.h"
 
 #define MY_CLASS ELM_CALENDAR_CLASS

src/lib/elementary/elm_clock.c

@@ -8,7 +8,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 #include "elm_widget_clock.h"
-#include "efl_ui_focus_composition.eo.h"
 
 #define MY_CLASS ELM_CLOCK_CLASS
 

src/lib/elementary/elm_colorselector.c

@@ -10,7 +10,6 @@
 #include <Elementary.h>
 #include "elm_priv.h"
 #include "elm_widget_colorselector.h"
-#include "efl_ui_focus_composition.eo.h"
 
 #define MY_CLASS ELM_COLORSELECTOR_CLASS
 

src/lib/elementary/elm_priv.h

@@ -54,8 +54,6 @@
 #include "elm_access.eo.h"
 #include "elm_code_private.h"
 
-#include "efl_ui_focus_layer.eo.h"
-
 #ifdef HAVE_LANGINFO_H
 # include <langinfo.h>
 #endif

src/lib/elementary/elm_segment_control.c

@@ -13,7 +13,6 @@
 #include "elm_segment_control.eo.h"
 #include "elm_segment_control_item.eo.h"
 #include "elm_widget_segment_control.h"
-#include "efl_ui_focus_composition.eo.h"
 
 #define MY_CLASS ELM_SEGMENT_CONTROL_CLASS
 

src/lib/elementary/elm_spinner.c

@@ -12,7 +12,6 @@
 
 #include "elm_priv.h"
 #include "elm_widget_spinner.h"
-#include "efl_ui_focus_composition.eo.h"
 
 #include "Eo.h"