diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 94c2f4927..c2ee2dcae 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1621,7 +1621,7 @@ _e_comp_wl_cb_surface_create(struct wl_client *client, struct wl_resource *resou
                                   ews, _e_comp_wl_cb_surface_destroy);
 
    /* add this surface to the list of surfaces */
-   _e_wl_comp->surfaces = eina_list_append(_e_wl_comp->surfaces, ews);
+   _e_wl_comp->surfaces = eina_inlist_append(_e_wl_comp->surfaces, EINA_INLIST_GET(ews));
 }
 
 static void 
@@ -1679,7 +1679,7 @@ _e_comp_wl_cb_surface_destroy(struct wl_resource *resource)
      wl_resource_destroy(cb->wl.resource);
 
    /* remove this surface from the compositor's list of surfaces */
-   _e_wl_comp->surfaces = eina_list_remove(_e_wl_comp->surfaces, ews);
+   _e_wl_comp->surfaces = eina_inlist_remove(_e_wl_comp->surfaces, EINA_INLIST_GET(ews));
 
    /* free the allocated surface structure */
    E_FREE(ews);
diff --git a/src/bin/e_comp_wl.h b/src/bin/e_comp_wl.h
index b58b91ba8..fbc01502f 100644
--- a/src/bin/e_comp_wl.h
+++ b/src/bin/e_comp_wl.h
@@ -278,6 +278,7 @@ struct _E_Wayland_Buffer_Reference
 
 struct _E_Wayland_Surface
 {
+   EINA_INLIST;
    struct 
      {
         struct wl_resource *surface;
@@ -482,7 +483,7 @@ struct _E_Wayland_Compositor
 
    E_Wayland_Input *input;
 
-   Eina_List *surfaces;
+   Eina_Inlist *surfaces;
    Eina_List *seats;
 
    struct wl_list outputs;