diff --git a/legacy/eobj/src/examples/evas/elw_box.h b/legacy/eobj/src/examples/evas/elw_box.h
index 23cd731a35..c25382cf34 100644
--- a/legacy/eobj/src/examples/evas/elw_box.h
+++ b/legacy/eobj/src/examples/evas/elw_box.h
@@ -20,6 +20,6 @@ enum {
 #define elw_box_pack_end(obj) ELW_BOX_ID(ELW_BOX_SUB_ID_PACK_END), EO_TYPECHECK(Eo *, obj)
 
 #define ELW_BOX_CLASS elw_box_class_get()
-const Eo_Class *elw_box_class_get(void) EINA_CONST;
+const Eo_Class *elw_box_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/examples/evas/elw_boxedbutton.h b/legacy/eobj/src/examples/evas/elw_boxedbutton.h
index e9ee82ae1e..e4ecfd2f83 100644
--- a/legacy/eobj/src/examples/evas/elw_boxedbutton.h
+++ b/legacy/eobj/src/examples/evas/elw_boxedbutton.h
@@ -4,6 +4,6 @@
 #include "Eo.h"
 
 #define ELW_BOXEDBUTTON_CLASS elw_boxedbutton_class_get()
-const Eo_Class *elw_boxedbutton_class_get(void) EINA_CONST;
+const Eo_Class *elw_boxedbutton_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/examples/evas/elw_button.h b/legacy/eobj/src/examples/evas/elw_button.h
index 5932ac5f18..8cecb8104e 100644
--- a/legacy/eobj/src/examples/evas/elw_button.h
+++ b/legacy/eobj/src/examples/evas/elw_button.h
@@ -24,6 +24,6 @@ extern const Eo_Event_Description _EV_CLICKED;
 #define EV_CLICKED (&(_EV_CLICKED))
 
 #define ELW_BUTTON_CLASS elw_button_class_get()
-const Eo_Class *elw_button_class_get(void) EINA_CONST;
+const Eo_Class *elw_button_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/examples/evas/elw_win.h b/legacy/eobj/src/examples/evas/elw_win.h
index a97b89bd4d..babb28b11a 100644
--- a/legacy/eobj/src/examples/evas/elw_win.h
+++ b/legacy/eobj/src/examples/evas/elw_win.h
@@ -4,6 +4,6 @@
 #include "Eo.h"
 
 #define ELW_WIN_CLASS elw_win_class_get()
-const Eo_Class *elw_win_class_get(void) EINA_CONST;
+const Eo_Class *elw_win_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/examples/evas/evas_obj.h b/legacy/eobj/src/examples/evas/evas_obj.h
index 9efdaf3da7..ee25be32a2 100644
--- a/legacy/eobj/src/examples/evas/evas_obj.h
+++ b/legacy/eobj/src/examples/evas/evas_obj.h
@@ -68,7 +68,7 @@ enum {
 #define evas_obj_child_add(child) EVAS_OBJ_ID(EVAS_OBJ_SUB_ID_CHILD_ADD), EO_TYPECHECK(Eo *, child)
 
 #define EVAS_OBJ_CLASS evas_object_class_get()
-const Eo_Class *evas_object_class_get(void) EINA_CONST;
+const Eo_Class *evas_object_class_get(void);
 
 #define EVAS_OBJ_STR "Evas_Obj"
 /* FIXME: Hack in the meanwhile. */
diff --git a/legacy/eobj/src/tests/access/inherit.h b/legacy/eobj/src/tests/access/inherit.h
index dda9a0769c..26fa9d97ae 100644
--- a/legacy/eobj/src/tests/access/inherit.h
+++ b/legacy/eobj/src/tests/access/inherit.h
@@ -15,6 +15,6 @@ enum {
 #define inherit_prot_print() INHERIT_ID(INHERIT_SUB_ID_PROT_PRINT)
 
 #define INHERIT_CLASS inherit_class_get()
-const Eo_Class *inherit_class_get(void) EINA_CONST;
+const Eo_Class *inherit_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/access/simple.h b/legacy/eobj/src/tests/access/simple.h
index fb9607246a..902d89cabd 100644
--- a/legacy/eobj/src/tests/access/simple.h
+++ b/legacy/eobj/src/tests/access/simple.h
@@ -23,6 +23,6 @@ extern const Eo_Event_Description _EV_A_CHANGED;
 #define EV_A_CHANGED (&(_EV_A_CHANGED))
 
 #define SIMPLE_CLASS simple_class_get()
-const Eo_Class *simple_class_get(void) EINA_CONST;
+const Eo_Class *simple_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/composite_objects/comp.h b/legacy/eobj/src/tests/composite_objects/comp.h
index 3e15e3e62a..87f61f7488 100644
--- a/legacy/eobj/src/tests/composite_objects/comp.h
+++ b/legacy/eobj/src/tests/composite_objects/comp.h
@@ -4,6 +4,6 @@
 #include "Eo.h"
 
 #define COMP_CLASS comp_class_get()
-const Eo_Class *comp_class_get(void) EINA_CONST;
+const Eo_Class *comp_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/composite_objects/simple.h b/legacy/eobj/src/tests/composite_objects/simple.h
index e26ac878de..5d49b59ee1 100644
--- a/legacy/eobj/src/tests/composite_objects/simple.h
+++ b/legacy/eobj/src/tests/composite_objects/simple.h
@@ -25,6 +25,6 @@ extern const Eo_Event_Description _EV_A_CHANGED;
 #define EV_A_CHANGED (&(_EV_A_CHANGED))
 
 #define SIMPLE_CLASS simple_class_get()
-const Eo_Class *simple_class_get(void) EINA_CONST;
+const Eo_Class *simple_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/constructors/mixin.h b/legacy/eobj/src/tests/constructors/mixin.h
index 860a51304f..04f587e5ac 100644
--- a/legacy/eobj/src/tests/constructors/mixin.h
+++ b/legacy/eobj/src/tests/constructors/mixin.h
@@ -15,6 +15,6 @@ enum {
 #define mixin_add_and_print(x) MIXIN_ID(MIXIN_SUB_ID_ADD_AND_SET), EO_TYPECHECK(int, x)
 
 #define MIXIN_CLASS mixin_class_get()
-const Eo_Class *mixin_class_get(void) EINA_CONST;
+const Eo_Class *mixin_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/constructors/simple.h b/legacy/eobj/src/tests/constructors/simple.h
index 0f2d217ee8..773b7374c4 100644
--- a/legacy/eobj/src/tests/constructors/simple.h
+++ b/legacy/eobj/src/tests/constructors/simple.h
@@ -21,6 +21,6 @@ enum {
 #define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b)
 
 #define SIMPLE_CLASS simple_class_get()
-const Eo_Class *simple_class_get(void) EINA_CONST;
+const Eo_Class *simple_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/constructors/simple2.h b/legacy/eobj/src/tests/constructors/simple2.h
index d557d7e7b0..0857c45a71 100644
--- a/legacy/eobj/src/tests/constructors/simple2.h
+++ b/legacy/eobj/src/tests/constructors/simple2.h
@@ -4,6 +4,6 @@
 #include "Eo.h"
 
 #define SIMPLE2_CLASS simple2_class_get()
-const Eo_Class *simple2_class_get(void) EINA_CONST;
+const Eo_Class *simple2_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/constructors/simple3.h b/legacy/eobj/src/tests/constructors/simple3.h
index a8b1b7178d..dbb3841cc7 100644
--- a/legacy/eobj/src/tests/constructors/simple3.h
+++ b/legacy/eobj/src/tests/constructors/simple3.h
@@ -4,6 +4,6 @@
 #include "Eo.h"
 
 #define SIMPLE3_CLASS simple3_class_get()
-const Eo_Class *simple3_class_get(void) EINA_CONST;
+const Eo_Class *simple3_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/constructors/simple4.h b/legacy/eobj/src/tests/constructors/simple4.h
index a3b7387205..3e6d1a8d78 100644
--- a/legacy/eobj/src/tests/constructors/simple4.h
+++ b/legacy/eobj/src/tests/constructors/simple4.h
@@ -4,6 +4,6 @@
 #include "Eo.h"
 
 #define SIMPLE4_CLASS simple4_class_get()
-const Eo_Class *simple4_class_get(void) EINA_CONST;
+const Eo_Class *simple4_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/constructors/simple5.h b/legacy/eobj/src/tests/constructors/simple5.h
index 0157af8e07..8ae62153a4 100644
--- a/legacy/eobj/src/tests/constructors/simple5.h
+++ b/legacy/eobj/src/tests/constructors/simple5.h
@@ -4,6 +4,6 @@
 #include "Eo.h"
 
 #define SIMPLE5_CLASS simple5_class_get()
-const Eo_Class *simple5_class_get(void) EINA_CONST;
+const Eo_Class *simple5_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/constructors/simple6.h b/legacy/eobj/src/tests/constructors/simple6.h
index 0915aea69e..32ee3cb01a 100644
--- a/legacy/eobj/src/tests/constructors/simple6.h
+++ b/legacy/eobj/src/tests/constructors/simple6.h
@@ -4,6 +4,6 @@
 #include "Eo.h"
 
 #define SIMPLE6_CLASS simple6_class_get()
-const Eo_Class *simple6_class_get(void) EINA_CONST;
+const Eo_Class *simple6_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/eo_suite/class_simple.h b/legacy/eobj/src/tests/eo_suite/class_simple.h
index 35a58d24a0..eb58f6d93c 100644
--- a/legacy/eobj/src/tests/eo_suite/class_simple.h
+++ b/legacy/eobj/src/tests/eo_suite/class_simple.h
@@ -27,6 +27,6 @@ extern const Eo_Event_Description _SIG_A_CHANGED;
 #define SIG_A_CHANGED (&(_SIG_A_CHANGED))
 
 #define SIMPLE_CLASS simple_class_get()
-const Eo_Class *simple_class_get(void) EINA_CONST;
+const Eo_Class *simple_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/function_overrides/inherit.h b/legacy/eobj/src/tests/function_overrides/inherit.h
index 7300b9655a..d72c73a283 100644
--- a/legacy/eobj/src/tests/function_overrides/inherit.h
+++ b/legacy/eobj/src/tests/function_overrides/inherit.h
@@ -4,6 +4,6 @@
 #include "Eo.h"
 
 #define INHERIT_CLASS inherit_class_get()
-const Eo_Class *inherit_class_get(void) EINA_CONST;
+const Eo_Class *inherit_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/function_overrides/inherit2.h b/legacy/eobj/src/tests/function_overrides/inherit2.h
index dc6a7231c6..2bf7db997d 100644
--- a/legacy/eobj/src/tests/function_overrides/inherit2.h
+++ b/legacy/eobj/src/tests/function_overrides/inherit2.h
@@ -17,6 +17,6 @@ enum {
 #define inherit2_print2() INHERIT2_ID(INHERIT2_SUB_ID_PRINT2)
 
 #define INHERIT2_CLASS inherit2_class_get()
-const Eo_Class *inherit2_class_get(void) EINA_CONST;
+const Eo_Class *inherit2_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/function_overrides/inherit3.h b/legacy/eobj/src/tests/function_overrides/inherit3.h
index 78001478df..47d5d1cf82 100644
--- a/legacy/eobj/src/tests/function_overrides/inherit3.h
+++ b/legacy/eobj/src/tests/function_overrides/inherit3.h
@@ -4,6 +4,6 @@
 #include "Eo.h"
 
 #define INHERIT3_CLASS inherit3_class_get()
-const Eo_Class *inherit3_class_get(void) EINA_CONST;
+const Eo_Class *inherit3_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/function_overrides/simple.h b/legacy/eobj/src/tests/function_overrides/simple.h
index 4958e05790..a447d8cc5c 100644
--- a/legacy/eobj/src/tests/function_overrides/simple.h
+++ b/legacy/eobj/src/tests/function_overrides/simple.h
@@ -29,6 +29,6 @@ extern const Eo_Event_Description _SIG_A_CHANGED;
 #define SIG_A_CHANGED (&(_SIG_A_CHANGED))
 
 #define SIMPLE_CLASS simple_class_get()
-const Eo_Class *simple_class_get(void) EINA_CONST;
+const Eo_Class *simple_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/interface/interface.h b/legacy/eobj/src/tests/interface/interface.h
index 14dbb407c8..9a1c5fd07d 100644
--- a/legacy/eobj/src/tests/interface/interface.h
+++ b/legacy/eobj/src/tests/interface/interface.h
@@ -21,6 +21,6 @@ enum {
 #define interface_ab_sum_get(sum) INTERFACE_ID(INTERFACE_SUB_ID_AB_SUM_GET), EO_TYPECHECK(int *, sum)
 
 #define INTERFACE_CLASS interface_class_get()
-const Eo_Class *interface_class_get(void) EINA_CONST;
+const Eo_Class *interface_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/interface/interface2.h b/legacy/eobj/src/tests/interface/interface2.h
index e0b8436276..205b9b3ccd 100644
--- a/legacy/eobj/src/tests/interface/interface2.h
+++ b/legacy/eobj/src/tests/interface/interface2.h
@@ -21,6 +21,6 @@ enum {
 #define interface2_ab_sum_get2(sum) INTERFACE2_ID(INTERFACE2_SUB_ID_AB_SUM_GET2), EO_TYPECHECK(int *, sum)
 
 #define INTERFACE2_CLASS interface2_class_get()
-const Eo_Class *interface2_class_get(void) EINA_CONST;
+const Eo_Class *interface2_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/interface/simple.h b/legacy/eobj/src/tests/interface/simple.h
index 1c29e19470..61fa2f086a 100644
--- a/legacy/eobj/src/tests/interface/simple.h
+++ b/legacy/eobj/src/tests/interface/simple.h
@@ -44,6 +44,6 @@ enum {
 #define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b)
 
 #define SIMPLE_CLASS simple_class_get()
-const Eo_Class *simple_class_get(void) EINA_CONST;
+const Eo_Class *simple_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/mixin/mixin.h b/legacy/eobj/src/tests/mixin/mixin.h
index c03564c49c..2fa0c2248a 100644
--- a/legacy/eobj/src/tests/mixin/mixin.h
+++ b/legacy/eobj/src/tests/mixin/mixin.h
@@ -21,6 +21,6 @@ enum {
 #define mixin_ab_sum_get(sum) MIXIN_ID(MIXIN_SUB_ID_AB_SUM_GET), EO_TYPECHECK(int *, sum)
 
 #define MIXIN_CLASS mixin_class_get()
-const Eo_Class *mixin_class_get(void) EINA_CONST;
+const Eo_Class *mixin_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/mixin/mixin2.h b/legacy/eobj/src/tests/mixin/mixin2.h
index d1a5e77c57..324afaf0ce 100644
--- a/legacy/eobj/src/tests/mixin/mixin2.h
+++ b/legacy/eobj/src/tests/mixin/mixin2.h
@@ -9,6 +9,6 @@ typedef struct
 } Mixin2_Public_Data;
 
 #define MIXIN2_CLASS mixin2_class_get()
-const Eo_Class *mixin2_class_get(void) EINA_CONST;
+const Eo_Class *mixin2_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/mixin/mixin3.h b/legacy/eobj/src/tests/mixin/mixin3.h
index 74011fab4f..a05c2ec541 100644
--- a/legacy/eobj/src/tests/mixin/mixin3.h
+++ b/legacy/eobj/src/tests/mixin/mixin3.h
@@ -9,6 +9,6 @@ typedef struct
 } Mixin3_Public_Data;
 
 #define MIXIN3_CLASS mixin3_class_get()
-const Eo_Class *mixin3_class_get(void) EINA_CONST;
+const Eo_Class *mixin3_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/mixin/simple.h b/legacy/eobj/src/tests/mixin/simple.h
index 1c29e19470..61fa2f086a 100644
--- a/legacy/eobj/src/tests/mixin/simple.h
+++ b/legacy/eobj/src/tests/mixin/simple.h
@@ -44,6 +44,6 @@ enum {
 #define simple_b_get(b) SIMPLE_ID(SIMPLE_SUB_ID_B_GET), EO_TYPECHECK(int *, b)
 
 #define SIMPLE_CLASS simple_class_get()
-const Eo_Class *simple_class_get(void) EINA_CONST;
+const Eo_Class *simple_class_get(void);
 
 #endif
diff --git a/legacy/eobj/src/tests/signals/simple.h b/legacy/eobj/src/tests/signals/simple.h
index 11e06bc524..e54cf2aa8f 100644
--- a/legacy/eobj/src/tests/signals/simple.h
+++ b/legacy/eobj/src/tests/signals/simple.h
@@ -28,6 +28,6 @@ extern const Eo_Event_Description _EV_A_CHANGED;
 #define EV_A_CHANGED (&(_EV_A_CHANGED))
 
 #define SIMPLE_CLASS simple_class_get()
-const Eo_Class *simple_class_get(void) EINA_CONST;
+const Eo_Class *simple_class_get(void);
 
 #endif