diff --git a/legacy/evas/src/lib/Evas.h b/legacy/evas/src/lib/Evas.h
index bea5a7c1cf..e91af59fcd 100644
--- a/legacy/evas/src/lib/Evas.h
+++ b/legacy/evas/src/lib/Evas.h
@@ -704,8 +704,8 @@ extern "C" {
 
    EAPI const char       *evas_object_type_get              (const Evas_Object *obj);
 
-   EAPI void              evas_object_layer_set             (Evas_Object *obj, int l);
-   EAPI int               evas_object_layer_get             (const Evas_Object *obj);
+   EAPI void              evas_object_layer_set             (Evas_Object *obj, short l);
+   EAPI short             evas_object_layer_get             (const Evas_Object *obj);
 
    EAPI void              evas_object_raise                 (Evas_Object *obj);
    EAPI void              evas_object_lower                 (Evas_Object *obj);
diff --git a/legacy/evas/src/lib/canvas/evas_layer.c b/legacy/evas/src/lib/canvas/evas_layer.c
index 5e466af94c..2f8f613b16 100644
--- a/legacy/evas/src/lib/canvas/evas_layer.c
+++ b/legacy/evas/src/lib/canvas/evas_layer.c
@@ -78,7 +78,7 @@ evas_layer_free(Evas_Layer *lay)
 }
 
 Evas_Layer *
-evas_layer_find(Evas *e, int layer_num)
+evas_layer_find(Evas *e, short layer_num)
 {
    Evas_Object_List *list;
 
@@ -139,7 +139,7 @@ evas_layer_del(Evas_Layer *lay)
  * @ingroup Evas_Object_Layer_Group
  */
 EAPI void
-evas_object_layer_set(Evas_Object *obj, int l)
+evas_object_layer_set(Evas_Object *obj, short l)
 {
    Evas *e;
 
@@ -187,7 +187,7 @@ evas_object_layer_set(Evas_Object *obj, int l)
  * @return  Number of the layer.
  * @ingroup Evas_Object_Layer_Group
  */
-EAPI int
+EAPI short
 evas_object_layer_get(const Evas_Object *obj)
 {
    MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
diff --git a/legacy/evas/src/lib/include/evas_private.h b/legacy/evas/src/lib/include/evas_private.h
index 7af3663cd6..62d95588f1 100644
--- a/legacy/evas/src/lib/include/evas_private.h
+++ b/legacy/evas/src/lib/include/evas_private.h
@@ -361,7 +361,7 @@ struct _Evas_Layer
 {
    Evas_Object_List  _list_data;
 
-   int               layer;
+   short             layer;
    Evas_Object      *objects;
 
    Evas             *evas;
@@ -416,8 +416,8 @@ struct _Evas_Object
       struct {
 	 unsigned char  r, g, b, a;
       } color;
-      int               layer;
       Evas_Object      *clipper;
+      short             layer;
       Evas_Bool         visible : 1;
       Evas_Bool         have_clipees : 1;
       Evas_Bool         anti_alias : 1;
@@ -694,7 +694,7 @@ void evas_object_recalc_clippees(Evas_Object *obj);
 Evas_Layer *evas_layer_new(Evas *e);
 void evas_layer_pre_free(Evas_Layer *lay);
 void evas_layer_free(Evas_Layer *lay);
-Evas_Layer *evas_layer_find(Evas *e, int layer_num);
+Evas_Layer *evas_layer_find(Evas *e, short layer_num);
 void evas_layer_add(Evas_Layer *lay);
 void evas_layer_del(Evas_Layer *lay);
 void evas_object_coords_recalc(Evas_Object *obj);