diff --git a/src/lib/elementary/efl_ui_grid.c b/src/lib/elementary/efl_ui_grid.c
index 7322e5fdcf..331b435b68 100644
--- a/src/lib/elementary/efl_ui_grid.c
+++ b/src/lib/elementary/efl_ui_grid.c
@@ -6,7 +6,7 @@
 #define EFL_UI_SCROLL_MANAGER_PROTECTED
 #define EFL_UI_SCROLLBAR_PROTECTED
 
-#include <Elementary.h>
+#include <Efl_Ui.h>
 #include "elm_priv.h"
 #include "efl_ui_item_private.h"
 #include "efl_ui_grid_item_private.h"
@@ -25,7 +25,7 @@ _efl_ui_grid_efl_object_constructor(Eo *obj, Efl_Ui_Grid_Data *pd EINA_UNUSED)
 {
    obj = efl_constructor(efl_super(obj, MY_CLASS));
 
-   efl_ui_item_container_position_manager_set(obj, efl_new(EFL_UI_GRID_POSITION_MANAGER_CLASS));
+   efl_ui_item_container_position_manager_set(obj, efl_new(EFL_UI_POSITION_MANAGER_GRID_CLASS));
 
    return obj;
 }
diff --git a/src/lib/elementary/efl_ui_list.c b/src/lib/elementary/efl_ui_list.c
index 99dd95963c..8d8cbc25f8 100644
--- a/src/lib/elementary/efl_ui_list.c
+++ b/src/lib/elementary/efl_ui_list.c
@@ -6,7 +6,7 @@
 #define EFL_UI_SCROLL_MANAGER_PROTECTED
 #define EFL_UI_SCROLLBAR_PROTECTED
 
-#include <Elementary.h>
+#include <Efl_Ui.h>
 #include "elm_priv.h"
 #include "efl_ui_list_item_private.h"
 #include "efl_ui_item_private.h"
@@ -25,7 +25,7 @@ _efl_ui_list_efl_object_constructor(Eo *obj, Efl_Ui_List_Data *pd EINA_UNUSED)
 {
    obj = efl_constructor(efl_super(obj, MY_CLASS));
 
-   efl_ui_item_container_position_manager_set(obj, efl_new(EFL_UI_LIST_POSITION_MANAGER_CLASS));
+   efl_ui_item_container_position_manager_set(obj, efl_new(EFL_UI_POSITION_MANAGER_LIST_CLASS));
 
    return obj;
 }