aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-06-05 18:03:49 +0200
committerXavi Artigas <xavierartigas@yahoo.es>2018-06-06 11:51:59 +0200
commit1c7a82777156937f3761196520bdf337d0dfad2b (patch)
tree8cf9548ecbf98a49cae4a6c3a7a571ca2fa4950a
parentevas engines: do not immediately free native surface when unsetting it (diff)
downloadefl-devs/xartigas/remove-legacy-eo-files.tar.gz
ecore: Describe ecore_event_message* in C instead of Eodevs/xartigas/remove-legacy-eo-files
This is a legacy class and eo files are going to be used exclusively for the EFL API.
-rw-r--r--src/Makefile_Ecore.am2
-rw-r--r--src/lib/ecore/ecore_event_message.c57
-rw-r--r--src/lib/ecore/ecore_event_message.eo31
-rw-r--r--src/lib/ecore/ecore_event_message.h64
-rw-r--r--src/lib/ecore/ecore_event_message_handler.c109
-rw-r--r--src/lib/ecore/ecore_event_message_handler.eo92
-rw-r--r--src/lib/ecore/ecore_event_message_handler.h115
-rw-r--r--src/lib/ecore/ecore_private.h4
8 files changed, 345 insertions, 129 deletions
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 92ddd3e17c..7e3ae0a1f6 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -3,8 +3,6 @@
ecore_eolian_files_legacy = \
lib/ecore/ecore_exe.eo \
- lib/ecore/ecore_event_message.eo \
- lib/ecore/ecore_event_message_handler.eo \
lib/ecore/efl_loop_timer.eo
ecore_eolian_files_public = \
diff --git a/src/lib/ecore/ecore_event_message.c b/src/lib/ecore/ecore_event_message.c
index 768e3779b7..436f028941 100644
--- a/src/lib/ecore/ecore_event_message.c
+++ b/src/lib/ecore/ecore_event_message.c
@@ -78,4 +78,59 @@ _ecore_event_message_efl_object_destructor(Eo *obj EINA_UNUSED, Ecore_Event_Mess
//////////////////////////////////////////////////////////////////////////
-#include "ecore_event_message.eo.c"
+void _ecore_event_message_data_set(Eo *obj, Ecore_Event_Message_Data *pd, int type, void *data, void *free_func, void *free_data);
+
+EOAPI EFL_VOID_FUNC_BODYV(ecore_event_message_data_set, EFL_FUNC_CALL(type, data, free_func, free_data), int type, void *data, void *free_func, void *free_data);
+
+void _ecore_event_message_data_get(const Eo *obj, Ecore_Event_Message_Data *pd, int *type, void **data, void **free_func, void **free_data);
+
+EOAPI EFL_VOID_FUNC_BODYV_CONST(ecore_event_message_data_get, EFL_FUNC_CALL(type, data, free_func, free_data), int *type, void **data, void **free_func, void **free_data);
+
+void _ecore_event_message_data_steal(Eo *obj, Ecore_Event_Message_Data *pd, int *type, void **data, void **free_func, void **free_data);
+
+EOAPI EFL_VOID_FUNC_BODYV(ecore_event_message_data_steal, EFL_FUNC_CALL(type, data, free_func, free_data), int *type, void **data, void **free_func, void **free_data);
+
+Efl_Object *_ecore_event_message_efl_object_constructor(Eo *obj, Ecore_Event_Message_Data *pd);
+
+
+void _ecore_event_message_efl_object_destructor(Eo *obj, Ecore_Event_Message_Data *pd);
+
+
+static Eina_Bool
+_ecore_event_message_class_initializer(Efl_Class *klass)
+{
+ const Efl_Object_Ops *opsp = NULL, *copsp = NULL;
+
+#ifndef ECORE_EVENT_MESSAGE_EXTRA_OPS
+#define ECORE_EVENT_MESSAGE_EXTRA_OPS
+#endif
+
+ EFL_OPS_DEFINE(ops,
+ EFL_OBJECT_OP_FUNC(ecore_event_message_data_set, _ecore_event_message_data_set),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_data_get, _ecore_event_message_data_get),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_data_steal, _ecore_event_message_data_steal),
+ EFL_OBJECT_OP_FUNC(efl_constructor, _ecore_event_message_efl_object_constructor),
+ EFL_OBJECT_OP_FUNC(efl_destructor, _ecore_event_message_efl_object_destructor),
+ ECORE_EVENT_MESSAGE_EXTRA_OPS
+ );
+ opsp = &ops;
+
+#ifdef ECORE_EVENT_MESSAGE_EXTRA_CLASS_OPS
+ EFL_OPS_DEFINE(cops, ECORE_EVENT_MESSAGE_EXTRA_CLASS_OPS);
+ copsp = &cops;
+#endif
+
+ return efl_class_functions_set(klass, opsp, copsp);
+}
+
+static const Efl_Class_Description _ecore_event_message_class_desc = {
+ EO_VERSION,
+ "Ecore.Event.Message",
+ EFL_CLASS_TYPE_REGULAR,
+ sizeof(Ecore_Event_Message_Data),
+ _ecore_event_message_class_initializer,
+ NULL,
+ NULL
+};
+
+EFL_DEFINE_CLASS(ecore_event_message_class_get, &_ecore_event_message_class_desc, EFL_LOOP_MESSAGE_CLASS, NULL);
diff --git a/src/lib/ecore/ecore_event_message.eo b/src/lib/ecore/ecore_event_message.eo
deleted file mode 100644
index aae68c16e0..0000000000
--- a/src/lib/ecore/ecore_event_message.eo
+++ /dev/null
@@ -1,31 +0,0 @@
-class Ecore.Event.Message (Efl.Loop_Message)
-{
- [[ For Legacy API usage Only. Legacy Ecore Events ]]
- methods {
- @property data {
- [[ Property of the legacy event - set and get it ]]
- set { }
- get { }
- values {
- type: int; [[ The event type ]]
- data: void_ptr; [[ The event data ]]
- free_func: void_ptr; [[ Being lazy for legacy ]]
- free_data: void_ptr; [[ Free func data ]]
- }
- }
- data_steal {
- [[ Steal the data out and set internal values to -1
- for type and NULL for other vals ]]
- params {
- @out type: int; [[ The event type ]]
- @out data: void_ptr; [[ The event data ]]
- @out free_func: void_ptr; [[ Being lazy for legacy ]]
- @out free_data: void_ptr; [[ Free func data ]]
- }
- }
- }
- implements {
- Efl.Object.constructor;
- Efl.Object.destructor;
- }
-}
diff --git a/src/lib/ecore/ecore_event_message.h b/src/lib/ecore/ecore_event_message.h
new file mode 100644
index 0000000000..5bec6f9049
--- /dev/null
+++ b/src/lib/ecore/ecore_event_message.h
@@ -0,0 +1,64 @@
+#ifndef _ECORE_EVENT_MESSAGE_H_
+#define _ECORE_EVENT_MESSAGE_H_
+
+#ifndef _ECORE_EVENT_MESSAGE_EO_CLASS_TYPE
+#define _ECORE_EVENT_MESSAGE_EO_CLASS_TYPE
+
+typedef Eo Ecore_Event_Message;
+
+#endif
+
+#ifndef _ECORE_EVENT_MESSAGE_EO_TYPES
+#define _ECORE_EVENT_MESSAGE_EO_TYPES
+
+
+#endif
+/** For Legacy API usage Only. Legacy Ecore Events
+ *
+ * @ingroup Ecore_Event_Message
+ */
+#define ECORE_EVENT_MESSAGE_CLASS ecore_event_message_class_get()
+
+EWAPI const Efl_Class *ecore_event_message_class_get(void);
+
+/**
+ * @brief Property of the legacy event - set and get it
+ *
+ * @param[in] obj The object.
+ * @param[in] type The event type
+ * @param[in] data The event data
+ * @param[in] free_func Being lazy for legacy
+ * @param[in] free_data Free func data
+ *
+ * @ingroup Ecore_Event_Message
+ */
+EOAPI void ecore_event_message_data_set(Eo *obj, int type, void *data, void *free_func, void *free_data);
+
+/**
+ * @brief Property of the legacy event - set and get it
+ *
+ * @param[in] obj The object.
+ * @param[out] type The event type
+ * @param[out] data The event data
+ * @param[out] free_func Being lazy for legacy
+ * @param[out] free_data Free func data
+ *
+ * @ingroup Ecore_Event_Message
+ */
+EOAPI void ecore_event_message_data_get(const Eo *obj, int *type, void **data, void **free_func, void **free_data);
+
+/**
+ * @brief Steal the data out and set internal values to -1 for type and NULL
+ * for other vals
+ *
+ * @param[in] obj The object.
+ * @param[out] type The event type
+ * @param[out] data The event data
+ * @param[out] free_func Being lazy for legacy
+ * @param[out] free_data Free func data
+ *
+ * @ingroup Ecore_Event_Message
+ */
+EOAPI void ecore_event_message_data_steal(Eo *obj, int *type, void **data, void **free_func, void **free_data);
+
+#endif
diff --git a/src/lib/ecore/ecore_event_message_handler.c b/src/lib/ecore/ecore_event_message_handler.c
index 1b593d0771..81380adbd2 100644
--- a/src/lib/ecore/ecore_event_message_handler.c
+++ b/src/lib/ecore/ecore_event_message_handler.c
@@ -433,4 +433,111 @@ _ecore_event_message_handler_type_flush(Eo *obj, Ecore_Event_Message_Handler_Dat
//////////////////////////////////////////////////////////////////////////
-#include "ecore_event_message_handler.eo.c"
+EWAPI const Efl_Event_Description _ECORE_EVENT_MESSAGE_HANDLER_EVENT_MESSAGE_ECORE_EVENT =
+ EFL_EVENT_DESCRIPTION("message,ecore,event");
+
+Ecore_Event_Message *_ecore_event_message_handler_message_type_add(Eo *obj, Ecore_Event_Message_Handler_Data *pd);
+
+EOAPI EFL_FUNC_BODY(ecore_event_message_handler_message_type_add, Ecore_Event_Message *, NULL);
+
+int _ecore_event_message_handler_type_new(Eo *obj, Ecore_Event_Message_Handler_Data *pd);
+
+EOAPI EFL_FUNC_BODY(ecore_event_message_handler_type_new, int, 0);
+
+void *_ecore_event_message_handler_handler_add(Eo *obj, Ecore_Event_Message_Handler_Data *pd, int type, void *func, void *data);
+
+EOAPI EFL_FUNC_BODYV(ecore_event_message_handler_add, void *, NULL, EFL_FUNC_CALL(type, func, data), int type, void *func, void *data);
+
+void *_ecore_event_message_handler_handler_prepend(Eo *obj, Ecore_Event_Message_Handler_Data *pd, int type, void *func, void *data);
+
+EOAPI EFL_FUNC_BODYV(ecore_event_message_handler_prepend, void *, NULL, EFL_FUNC_CALL(type, func, data), int type, void *func, void *data);
+
+void *_ecore_event_message_handler_handler_del(Eo *obj, Ecore_Event_Message_Handler_Data *pd, void *handler);
+
+EOAPI EFL_FUNC_BODYV(ecore_event_message_handler_del, void *, NULL, EFL_FUNC_CALL(handler), void *handler);
+
+void *_ecore_event_message_handler_handler_data_get(Eo *obj, Ecore_Event_Message_Handler_Data *pd, void *handler);
+
+EOAPI EFL_FUNC_BODYV(ecore_event_message_handler_data_get, void *, NULL, EFL_FUNC_CALL(handler), void *handler);
+
+void *_ecore_event_message_handler_handler_data_set(Eo *obj, Ecore_Event_Message_Handler_Data *pd, void *handler, void *data);
+
+EOAPI EFL_FUNC_BODYV(ecore_event_message_handler_data_set, void *, NULL, EFL_FUNC_CALL(handler, data), void *handler, void *data);
+
+void *_ecore_event_message_handler_filter_add(Eo *obj, Ecore_Event_Message_Handler_Data *pd, void *func_start, void *func_filter, void *func_end, void *data);
+
+EOAPI EFL_FUNC_BODYV(ecore_event_message_handler_filter_add, void *, NULL, EFL_FUNC_CALL(func_start, func_filter, func_end, data), void *func_start, void *func_filter, void *func_end, void *data);
+
+void *_ecore_event_message_handler_filter_del(Eo *obj, Ecore_Event_Message_Handler_Data *pd, void *filter);
+
+EOAPI EFL_FUNC_BODYV(ecore_event_message_handler_filter_del, void *, NULL, EFL_FUNC_CALL(filter), void *filter);
+
+int _ecore_event_message_handler_current_type_get(Eo *obj, Ecore_Event_Message_Handler_Data *pd);
+
+EOAPI EFL_FUNC_BODY(ecore_event_message_handler_current_type_get, int, 0);
+
+void *_ecore_event_message_handler_current_event_get(Eo *obj, Ecore_Event_Message_Handler_Data *pd);
+
+EOAPI EFL_FUNC_BODY(ecore_event_message_handler_current_event_get, void *, NULL);
+
+void _ecore_event_message_handler_type_flush(Eo *obj, Ecore_Event_Message_Handler_Data *pd, int type);
+
+EOAPI EFL_VOID_FUNC_BODYV(ecore_event_message_handler_type_flush, EFL_FUNC_CALL(type), int type);
+
+Efl_Object *_ecore_event_message_handler_efl_object_constructor(Eo *obj, Ecore_Event_Message_Handler_Data *pd);
+
+
+void _ecore_event_message_handler_efl_object_destructor(Eo *obj, Ecore_Event_Message_Handler_Data *pd);
+
+
+void _ecore_event_message_handler_efl_loop_message_handler_message_call(Eo *obj, Ecore_Event_Message_Handler_Data *pd, Efl_Loop_Message *message);
+
+
+static Eina_Bool
+_ecore_event_message_handler_class_initializer(Efl_Class *klass)
+{
+ const Efl_Object_Ops *opsp = NULL, *copsp = NULL;
+
+#ifndef ECORE_EVENT_MESSAGE_HANDLER_EXTRA_OPS
+#define ECORE_EVENT_MESSAGE_HANDLER_EXTRA_OPS
+#endif
+
+ EFL_OPS_DEFINE(ops,
+ EFL_OBJECT_OP_FUNC(ecore_event_message_handler_message_type_add, _ecore_event_message_handler_message_type_add),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_handler_type_new, _ecore_event_message_handler_type_new),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_handler_add, _ecore_event_message_handler_handler_add),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_handler_prepend, _ecore_event_message_handler_handler_prepend),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_handler_del, _ecore_event_message_handler_handler_del),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_handler_data_get, _ecore_event_message_handler_handler_data_get),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_handler_data_set, _ecore_event_message_handler_handler_data_set),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_handler_filter_add, _ecore_event_message_handler_filter_add),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_handler_filter_del, _ecore_event_message_handler_filter_del),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_handler_current_type_get, _ecore_event_message_handler_current_type_get),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_handler_current_event_get, _ecore_event_message_handler_current_event_get),
+ EFL_OBJECT_OP_FUNC(ecore_event_message_handler_type_flush, _ecore_event_message_handler_type_flush),
+ EFL_OBJECT_OP_FUNC(efl_constructor, _ecore_event_message_handler_efl_object_constructor),
+ EFL_OBJECT_OP_FUNC(efl_destructor, _ecore_event_message_handler_efl_object_destructor),
+ EFL_OBJECT_OP_FUNC(efl_loop_message_handler_message_call, _ecore_event_message_handler_efl_loop_message_handler_message_call),
+ ECORE_EVENT_MESSAGE_HANDLER_EXTRA_OPS
+ );
+ opsp = &ops;
+
+#ifdef ECORE_EVENT_MESSAGE_HANDLER_EXTRA_CLASS_OPS
+ EFL_OPS_DEFINE(cops, ECORE_EVENT_MESSAGE_HANDLER_EXTRA_CLASS_OPS);
+ copsp = &cops;
+#endif
+
+ return efl_class_functions_set(klass, opsp, copsp);
+}
+
+static const Efl_Class_Description _ecore_event_message_handler_class_desc = {
+ EO_VERSION,
+ "Ecore.Event.Message.Handler",
+ EFL_CLASS_TYPE_REGULAR,
+ sizeof(Ecore_Event_Message_Handler_Data),
+ _ecore_event_message_handler_class_initializer,
+ NULL,
+ NULL
+};
+
+EFL_DEFINE_CLASS(ecore_event_message_handler_class_get, &_ecore_event_message_handler_class_desc, EFL_LOOP_MESSAGE_HANDLER_CLASS, NULL);
diff --git a/src/lib/ecore/ecore_event_message_handler.eo b/src/lib/ecore/ecore_event_message_handler.eo
deleted file mode 100644
index f6f9c07846..0000000000
--- a/src/lib/ecore/ecore_event_message_handler.eo
+++ /dev/null
@@ -1,92 +0,0 @@
-class Ecore.Event.Message.Handler (Efl.Loop_Message_Handler)
-{
- [[ For Legacy API usage Only
- This class is rather hacky/messy as it's really internal glue
- to handle legacy ecore events alongside the new loop message
- stuff merged together. This is ugly as it's internal only
- to quickly glue things together and is destined for death in
- EFL 2.0 or when we dump legacy.
- ]]
- methods {
- message_type_add {
- [[ ]]
- return: Ecore.Event.Message; [[ ]]
- }
- type_new {
- [[ ]]
- return: int; [[ ]]
- }
- handler_add {
- [[ Legacy list of callback handlers so they can return false ]]
- params {
- type: int;
- func: void_ptr;
- data: void_ptr;
- }
- return: void_ptr; [[ Lazy return handle ]]
- }
- handler_prepend {
- [[ Legacy list of callback handlers so they can return false ]]
- params {
- type: int;
- func: void_ptr;
- data: void_ptr;
- }
- return: void_ptr; [[ Lazy return handle ]]
- }
- handler_del {
- params {
- handler: void_ptr; [[ handler returned from handler_add() ]]
- }
- return: void_ptr; [[ handler data ptr ]]
- }
- handler_data_get {
- params {
- handler: void_ptr; [[ handler returned from handler_add() ]]
- }
- return: void_ptr; [[ handler data ptr ]]
- }
- handler_data_set {
- params {
- handler: void_ptr; [[ handler returned from handler_add() ]]
- data: void_ptr;
- }
- return: void_ptr; [[ prev handler data ptr ]]
- }
- filter_add {
- [[ Legacy event filter ]]
- params {
- func_start: void_ptr;
- func_filter: void_ptr;
- func_end: void_ptr;
- data: void_ptr;
- }
- return: void_ptr; [[ Lazy return filter handle ]]
- }
- filter_del {
- params {
- filter: void_ptr; [[ filter returned from filter_add() ]]
- }
- return: void_ptr; [[ filter data ptr ]]
- }
- current_type_get {
- return: int; [[ ]]
- }
- current_event_get {
- return: void_ptr; [[ ]]
- }
- type_flush {
- params {
- type: int; [[ the event type to flush ]]
- }
- }
- }
- events {
- message,ecore,event: Ecore.Event.Message; [[ Sample - override this ]]
- }
- implements {
- Efl.Object.constructor;
- Efl.Object.destructor;
- Efl.Loop_Message_Handler.message_call; [[ Sample - override this ]]
- }
-}
diff --git a/src/lib/ecore/ecore_event_message_handler.h b/src/lib/ecore/ecore_event_message_handler.h
new file mode 100644
index 0000000000..44de11932c
--- /dev/null
+++ b/src/lib/ecore/ecore_event_message_handler.h
@@ -0,0 +1,115 @@
+#ifndef _ECORE_EVENT_MESSAGE_HANDLER_H_
+#define _ECORE_EVENT_MESSAGE_HANDLER_H_
+
+#ifndef _ECORE_EVENT_MESSAGE_HANDLER_EO_CLASS_TYPE
+#define _ECORE_EVENT_MESSAGE_HANDLER_EO_CLASS_TYPE
+
+typedef Eo Ecore_Event_Message_Handler;
+
+#endif
+
+#ifndef _ECORE_EVENT_MESSAGE_HANDLER_EO_TYPES
+#define _ECORE_EVENT_MESSAGE_HANDLER_EO_TYPES
+
+
+#endif
+/** For Legacy API usage Only This class is rather hacky/messy as it's really
+ * internal glue to handle legacy ecore events alongside the new loop message
+ * stuff merged together. This is ugly as it's internal only to quickly glue
+ * things together and is destined for death in EFL 2.0 or when we dump legacy.
+ *
+ * @ingroup Ecore_Event_Message_Handler
+ */
+#define ECORE_EVENT_MESSAGE_HANDLER_CLASS ecore_event_message_handler_class_get()
+
+EWAPI const Efl_Class *ecore_event_message_handler_class_get(void);
+
+/**
+ * @brief No description supplied.
+ *
+ * @param[in] obj The object.
+ *
+ * @return No description supplied.
+ *
+ * @ingroup Ecore_Event_Message_Handler
+ */
+EOAPI Ecore_Event_Message *ecore_event_message_handler_message_type_add(Eo *obj);
+
+/**
+ * @brief No description supplied.
+ *
+ * @param[in] obj The object.
+ *
+ * @return No description supplied.
+ *
+ * @ingroup Ecore_Event_Message_Handler
+ */
+EOAPI int ecore_event_message_handler_type_new(Eo *obj);
+
+/**
+ * @brief Legacy list of callback handlers so they can return false
+ *
+ * @param[in] obj The object.
+ * @param[in] type
+ * @param[in] func
+ * @param[in] data
+ *
+ * @return Lazy return handle
+ *
+ * @ingroup Ecore_Event_Message_Handler
+ */
+EOAPI void *ecore_event_message_handler_add(Eo *obj, int type, void *func, void *data);
+
+/**
+ * @brief Legacy list of callback handlers so they can return false
+ *
+ * @param[in] obj The object.
+ * @param[in] type
+ * @param[in] func
+ * @param[in] data
+ *
+ * @return Lazy return handle
+ *
+ * @ingroup Ecore_Event_Message_Handler
+ */
+EOAPI void *ecore_event_message_handler_prepend(Eo *obj, int type, void *func, void *data);
+
+EOAPI void *ecore_event_message_handler_del(Eo *obj, void *handler);
+
+EOAPI void *ecore_event_message_handler_data_get(Eo *obj, void *handler);
+
+EOAPI void *ecore_event_message_handler_data_set(Eo *obj, void *handler, void *data);
+
+/**
+ * @brief Legacy event filter
+ *
+ * @param[in] obj The object.
+ * @param[in] func_start
+ * @param[in] func_filter
+ * @param[in] func_end
+ * @param[in] data
+ *
+ * @return Lazy return filter handle
+ *
+ * @ingroup Ecore_Event_Message_Handler
+ */
+EOAPI void *ecore_event_message_handler_filter_add(Eo *obj, void *func_start, void *func_filter, void *func_end, void *data);
+
+EOAPI void *ecore_event_message_handler_filter_del(Eo *obj, void *filter);
+
+EOAPI int ecore_event_message_handler_current_type_get(Eo *obj);
+
+EOAPI void *ecore_event_message_handler_current_event_get(Eo *obj);
+
+EOAPI void ecore_event_message_handler_type_flush(Eo *obj, int type);
+
+EWAPI extern const Efl_Event_Description _ECORE_EVENT_MESSAGE_HANDLER_EVENT_MESSAGE_ECORE_EVENT;
+
+/** Sample - override this
+ * @return Ecore_Event_Message *
+ *
+ * @ingroup Ecore_Event_Message_Handler
+ */
+#define ECORE_EVENT_MESSAGE_HANDLER_EVENT_MESSAGE_ECORE_EVENT (&(_ECORE_EVENT_MESSAGE_HANDLER_EVENT_MESSAGE_ECORE_EVENT))
+
+#endif
diff --git a/src/lib/ecore/ecore_private.h b/src/lib/ecore/ecore_private.h
index 8d7a2338a8..d3531ce2c9 100644
--- a/src/lib/ecore/ecore_private.h
+++ b/src/lib/ecore/ecore_private.h
@@ -6,8 +6,8 @@
#include "ecore_internal.h"
#include "ecore_exe.eo.h"
-#include "ecore_event_message.eo.h"
-#include "ecore_event_message_handler.eo.h"
+#include "ecore_event_message.h"
+#include "ecore_event_message_handler.h"
#ifdef EAPI
# undef EAPI