diff --git a/legacy/eobj/examples/access/inherit.c b/legacy/eobj/examples/access/inherit.c
index c28e9ff1ea..25e9970c0a 100644
--- a/legacy/eobj/examples/access/inherit.c
+++ b/legacy/eobj/examples/access/inherit.c
@@ -8,7 +8,7 @@
 
 EAPI Eobj_Op INHERIT_BASE_ID = 0;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _prot_print(Eobj *obj, void *class_data __UNUSED__, va_list *list)
diff --git a/legacy/eobj/examples/access/simple.c b/legacy/eobj/examples/access/simple.c
index cb9cc6446e..821c5fb46e 100644
--- a/legacy/eobj/examples/access/simple.c
+++ b/legacy/eobj/examples/access/simple.c
@@ -13,7 +13,7 @@ typedef struct
 EAPI const Eobj_Event_Description _SIG_A_CHANGED =
         EOBJ_EVENT_DESCRIPTION("a,changed", "i", "Called when a has changed.");
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _a_set(Eobj *obj, void *class_data, va_list *list)
diff --git a/legacy/eobj/examples/composite_objects/comp.c b/legacy/eobj/examples/composite_objects/comp.c
index d5bebb16ae..6a5a60e13f 100644
--- a/legacy/eobj/examples/composite_objects/comp.c
+++ b/legacy/eobj/examples/composite_objects/comp.c
@@ -8,7 +8,7 @@
 
 EAPI Eobj_Op COMP_BASE_ID = 0;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _a_get(Eobj *obj, void *class_data __UNUSED__, va_list *list)
diff --git a/legacy/eobj/examples/composite_objects/simple.c b/legacy/eobj/examples/composite_objects/simple.c
index 1563535bc9..4991e90e4b 100644
--- a/legacy/eobj/examples/composite_objects/simple.c
+++ b/legacy/eobj/examples/composite_objects/simple.c
@@ -8,7 +8,7 @@ EAPI Eobj_Op SIMPLE_BASE_ID = 0;
 EAPI const Eobj_Event_Description _SIG_A_CHANGED =
         EOBJ_EVENT_DESCRIPTION("a,changed", "i", "Called when a has changed.");
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _a_set(Eobj *obj, void *class_data, va_list *list)
diff --git a/legacy/eobj/examples/constructors/mixin.c b/legacy/eobj/examples/constructors/mixin.c
index 8f7371eb99..7f5595cf58 100644
--- a/legacy/eobj/examples/constructors/mixin.c
+++ b/legacy/eobj/examples/constructors/mixin.c
@@ -6,7 +6,7 @@
 
 EAPI Eobj_Op MIXIN_BASE_ID = 0;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _add_and_print_set(Eobj *obj, void *class_data __UNUSED__, va_list *list)
diff --git a/legacy/eobj/examples/constructors/simple.c b/legacy/eobj/examples/constructors/simple.c
index 0ff53a12ae..1ad348680b 100644
--- a/legacy/eobj/examples/constructors/simple.c
+++ b/legacy/eobj/examples/constructors/simple.c
@@ -12,7 +12,7 @@ typedef struct
    int b;
 } Private_Data;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static char *class_var = NULL;
 
diff --git a/legacy/eobj/examples/constructors/simple2.c b/legacy/eobj/examples/constructors/simple2.c
index 0633998cff..534993b296 100644
--- a/legacy/eobj/examples/constructors/simple2.c
+++ b/legacy/eobj/examples/constructors/simple2.c
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _constructor(Eobj *obj, void *class_data __UNUSED__)
diff --git a/legacy/eobj/examples/constructors/simple3.c b/legacy/eobj/examples/constructors/simple3.c
index 83675ef0d2..7e44d306e9 100644
--- a/legacy/eobj/examples/constructors/simple3.c
+++ b/legacy/eobj/examples/constructors/simple3.c
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _constructor(Eobj *obj, void *class_data __UNUSED__)
diff --git a/legacy/eobj/examples/constructors/simple4.c b/legacy/eobj/examples/constructors/simple4.c
index 0d56dd2102..bba2331d2e 100644
--- a/legacy/eobj/examples/constructors/simple4.c
+++ b/legacy/eobj/examples/constructors/simple4.c
@@ -3,7 +3,7 @@
 #include "simple.h"
 #include "simple4.h"
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 const Eobj_Class *
 simple4_class_get(void)
diff --git a/legacy/eobj/examples/constructors/simple5.c b/legacy/eobj/examples/constructors/simple5.c
index cd0ed9b929..ca0663a0e8 100644
--- a/legacy/eobj/examples/constructors/simple5.c
+++ b/legacy/eobj/examples/constructors/simple5.c
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _destructor(Eobj *obj, void *class_data __UNUSED__)
diff --git a/legacy/eobj/examples/constructors/simple6.c b/legacy/eobj/examples/constructors/simple6.c
index 8cbd41effb..d142c3d4c9 100644
--- a/legacy/eobj/examples/constructors/simple6.c
+++ b/legacy/eobj/examples/constructors/simple6.c
@@ -4,7 +4,7 @@
 
 #include "config.h"
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _destructor(Eobj *obj, void *class_data __UNUSED__)
diff --git a/legacy/eobj/examples/evas/elw_box.c b/legacy/eobj/examples/evas/elw_box.c
index 0b337a6f9a..990110ebe8 100644
--- a/legacy/eobj/examples/evas/elw_box.c
+++ b/legacy/eobj/examples/evas/elw_box.c
@@ -13,7 +13,7 @@ typedef struct
    Evas_Object *bx;
 } Widget_Data;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _pack_end(Eobj *obj __UNUSED__, void *class_data, va_list *list)
diff --git a/legacy/eobj/examples/evas/elw_boxedbutton.c b/legacy/eobj/examples/evas/elw_boxedbutton.c
index 9a0ec9f820..6323a1ef58 100644
--- a/legacy/eobj/examples/evas/elw_boxedbutton.c
+++ b/legacy/eobj/examples/evas/elw_boxedbutton.c
@@ -13,7 +13,7 @@ typedef struct
 //   Evas_Object *bx;
 } Widget_Data;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _constructor(Eobj *obj, void *class_data __UNUSED__)
diff --git a/legacy/eobj/examples/evas/elw_button.c b/legacy/eobj/examples/evas/elw_button.c
index 3ed3679644..b66734584a 100644
--- a/legacy/eobj/examples/evas/elw_button.c
+++ b/legacy/eobj/examples/evas/elw_button.c
@@ -16,7 +16,7 @@ typedef struct
    Evas_Object *bt;
 } Widget_Data;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _position_set(Eobj *obj, void *class_data __UNUSED__, va_list *list)
diff --git a/legacy/eobj/examples/evas/elw_win.c b/legacy/eobj/examples/evas/elw_win.c
index 0e3d7358f7..3fe4214703 100644
--- a/legacy/eobj/examples/evas/elw_win.c
+++ b/legacy/eobj/examples/evas/elw_win.c
@@ -10,7 +10,7 @@ typedef struct
    Evas_Object *bg;
 } Widget_Data;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 my_win_del(void *data, Evas_Object *obj, void *event_info)
diff --git a/legacy/eobj/examples/evas/evas_obj.c b/legacy/eobj/examples/evas/evas_obj.c
index 2fbce730fe..f7d5a40152 100644
--- a/legacy/eobj/examples/evas/evas_obj.c
+++ b/legacy/eobj/examples/evas/evas_obj.c
@@ -5,7 +5,7 @@
 
 #include "config.h"
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 EAPI Eobj_Op EVAS_OBJ_BASE_ID = 0;
 
diff --git a/legacy/eobj/examples/function_overrides/inherit.c b/legacy/eobj/examples/function_overrides/inherit.c
index 04da87c320..1e341530c4 100644
--- a/legacy/eobj/examples/function_overrides/inherit.c
+++ b/legacy/eobj/examples/function_overrides/inherit.c
@@ -3,7 +3,7 @@
 
 #include "inherit.h"
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 const Eobj_Class *
 inherit_class_get(void)
diff --git a/legacy/eobj/examples/function_overrides/inherit2.c b/legacy/eobj/examples/function_overrides/inherit2.c
index 6713eb05ab..cec0db6a38 100644
--- a/legacy/eobj/examples/function_overrides/inherit2.c
+++ b/legacy/eobj/examples/function_overrides/inherit2.c
@@ -10,7 +10,7 @@
 
 EAPI Eobj_Op INHERIT2_BASE_ID = 0;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _a_set(Eobj *obj, void *class_data __UNUSED__, va_list *list)
diff --git a/legacy/eobj/examples/function_overrides/inherit3.c b/legacy/eobj/examples/function_overrides/inherit3.c
index 21db48a44d..f6be6d7725 100644
--- a/legacy/eobj/examples/function_overrides/inherit3.c
+++ b/legacy/eobj/examples/function_overrides/inherit3.c
@@ -6,7 +6,7 @@
 
 #include "config.h"
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _a_set(Eobj *obj, void *class_data __UNUSED__, va_list *list)
diff --git a/legacy/eobj/examples/function_overrides/simple.c b/legacy/eobj/examples/function_overrides/simple.c
index 52ca72e5d1..542db7cb83 100644
--- a/legacy/eobj/examples/function_overrides/simple.c
+++ b/legacy/eobj/examples/function_overrides/simple.c
@@ -5,7 +5,7 @@
 
 EAPI Eobj_Op SIMPLE_BASE_ID = 0;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _a_set(Eobj *obj __UNUSED__, void *class_data, va_list *list)
diff --git a/legacy/eobj/examples/mixin/mixin.c b/legacy/eobj/examples/mixin/mixin.c
index 4c077c5b25..807f21ffe5 100644
--- a/legacy/eobj/examples/mixin/mixin.c
+++ b/legacy/eobj/examples/mixin/mixin.c
@@ -6,7 +6,7 @@
 
 EAPI Eobj_Op MIXIN_BASE_ID = 0;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _add_and_print_set(Eobj *obj, void *class_data __UNUSED__, va_list *list)
diff --git a/legacy/eobj/examples/mixin/simple.c b/legacy/eobj/examples/mixin/simple.c
index 45951e611c..d4663da6c1 100644
--- a/legacy/eobj/examples/mixin/simple.c
+++ b/legacy/eobj/examples/mixin/simple.c
@@ -12,7 +12,7 @@ typedef struct
    int b;
 } Private_Data;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 #define _GET_SET_FUNC(name) \
 static void \
diff --git a/legacy/eobj/examples/signals/simple.c b/legacy/eobj/examples/signals/simple.c
index f11184e125..f42f3ad457 100644
--- a/legacy/eobj/examples/signals/simple.c
+++ b/legacy/eobj/examples/signals/simple.c
@@ -14,7 +14,7 @@ typedef struct
 EAPI const Eobj_Event_Description _SIG_A_CHANGED =
         EOBJ_EVENT_DESCRIPTION("a,changed", "i", "Called when a has changed.");
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _a_set(Eobj *obj, void *class_data, va_list *list)
diff --git a/legacy/eobj/lib/Eobj.h b/legacy/eobj/lib/Eobj.h
index 87e96cf7d5..82ab960b3b 100644
--- a/legacy/eobj/lib/Eobj.h
+++ b/legacy/eobj/lib/Eobj.h
@@ -228,7 +228,7 @@ typedef struct _Eobj_Class_Description Eobj_Class_Description;
  * @param ... A NULL terminated list of extensions (interfaces, mixins and the classes of any composite objects).
  * @return The new class's handle on success, or NULL otherwise.
  */
-EAPI Eobj_Class *eobj_class_new(const Eobj_Class_Description *desc, const Eobj_Class *parent, ...);
+EAPI const Eobj_Class *eobj_class_new(const Eobj_Class_Description *desc, const Eobj_Class *parent, ...);
 
 /**
  * @brief Sets the OP functions for a class.
diff --git a/legacy/eobj/lib/eobj.c b/legacy/eobj/lib/eobj.c
index df8b05a524..0b4676b7b1 100644
--- a/legacy/eobj/lib/eobj.c
+++ b/legacy/eobj/lib/eobj.c
@@ -592,7 +592,7 @@ _eobj_class_check_op_descs(const Eobj_Class *klass)
    return EINA_TRUE;
 }
 
-EAPI Eobj_Class *
+EAPI const Eobj_Class *
 eobj_class_new(const Eobj_Class_Description *desc, const Eobj_Class *parent, ...)
 {
    Eobj_Class *klass;
@@ -1292,7 +1292,7 @@ eobj_event_callback_forwarder_del(Eobj *obj, const Eobj_Event_Description *desc,
 }
 
 /* EOBJ_CLASS_BASE stuff */
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 /* FIXME: Set proper type descriptions. */
 EAPI const Eobj_Event_Description _EOBJ_EV_CALLBACK_ADD =
diff --git a/legacy/eobj/tests/class_simple.c b/legacy/eobj/tests/class_simple.c
index 3a48708b61..a79b06b263 100644
--- a/legacy/eobj/tests/class_simple.c
+++ b/legacy/eobj/tests/class_simple.c
@@ -5,7 +5,7 @@
 
 EAPI Eobj_Op SIMPLE_BASE_ID = 0;
 
-static Eobj_Class *_my_class = NULL;
+static const Eobj_Class *_my_class = NULL;
 
 static void
 _a_set(Eobj *obj __UNUSED__, void *class_data, va_list *list)