diff --git a/legacy/elementary/src/lib/elm_object_item_migration_temp.h b/legacy/elementary/src/lib/elm_object_item_migration_temp.h
deleted file mode 100644
index 4563d260f4..0000000000
--- a/legacy/elementary/src/lib/elm_object_item_migration_temp.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#undef VIEW
-#undef WIDGET
-#define VIEW(X)   X->base->view
-#define WIDGET(X) X->base->widget
diff --git a/legacy/elementary/src/lib/elm_widget.h b/legacy/elementary/src/lib/elm_widget.h
index 1423c7b41a..e38a7a0f21 100644
--- a/legacy/elementary/src/lib/elm_widget.h
+++ b/legacy/elementary/src/lib/elm_widget.h
@@ -580,8 +580,8 @@ struct _Elm_Widget_Item_Data
 #define ELM_WIDGET_ITEM_MAGIC 0xef1e1301
    EINA_MAGIC;
 /* simple accessor macros */
-#define VIEW(X)   X->base.view
-#define WIDGET(X) X->base.widget
+#define VIEW(X)   X->base->view
+#define WIDGET(X) X->base->widget
 #define EO_OBJ(X) (Elm_Object_Item *)((X)?X->base->eo_obj:NULL)
    /**< the owner widget that owns this item */
    Evas_Object                   *widget;
diff --git a/legacy/elementary/src/lib/elm_widget_colorselector.h b/legacy/elementary/src/lib/elm_widget_colorselector.h
index 3666fc8d99..8ee8101b54 100644
--- a/legacy/elementary/src/lib/elm_widget_colorselector.h
+++ b/legacy/elementary/src/lib/elm_widget_colorselector.h
@@ -4,7 +4,6 @@
 #include "Elementary.h"
 #include "elm_color_item.eo.h"
 
-#include "elm_object_item_migration_temp.h"
 
 /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
  * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/legacy/elementary/src/lib/elm_widget_ctxpopup.h b/legacy/elementary/src/lib/elm_widget_ctxpopup.h
index 608707bd0e..e545a5da34 100644
--- a/legacy/elementary/src/lib/elm_widget_ctxpopup.h
+++ b/legacy/elementary/src/lib/elm_widget_ctxpopup.h
@@ -10,7 +10,6 @@
  * IT AT RUNTIME.
  */
 
-#include "elm_object_item_migration_temp.h"
 /**
  * @addtogroup Widget
  * @{
diff --git a/legacy/elementary/src/lib/elm_widget_dayselector.h b/legacy/elementary/src/lib/elm_widget_dayselector.h
index 6ce0d7d9c5..17ec8b3fa4 100644
--- a/legacy/elementary/src/lib/elm_widget_dayselector.h
+++ b/legacy/elementary/src/lib/elm_widget_dayselector.h
@@ -4,7 +4,6 @@
 #include "Elementary.h"
 #include "elm_dayselector_item.eo.h"
 
-#include "elm_object_item_migration_temp.h"
 
 /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
  * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/legacy/elementary/src/lib/elm_widget_diskselector.h b/legacy/elementary/src/lib/elm_widget_diskselector.h
index b2e816a72f..90e67fbd44 100644
--- a/legacy/elementary/src/lib/elm_widget_diskselector.h
+++ b/legacy/elementary/src/lib/elm_widget_diskselector.h
@@ -9,7 +9,6 @@
  * IT AT RUNTIME.
  */
 
-#include "elm_object_item_migration_temp.h"
 /**
  * @addtogroup Widget
  * @{
diff --git a/legacy/elementary/src/lib/elm_widget_flipselector.h b/legacy/elementary/src/lib/elm_widget_flipselector.h
index 0670cee146..8bddd9bea2 100644
--- a/legacy/elementary/src/lib/elm_widget_flipselector.h
+++ b/legacy/elementary/src/lib/elm_widget_flipselector.h
@@ -8,7 +8,6 @@
  * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK
  * IT AT RUNTIME.
  */
-#include "elm_object_item_migration_temp.h"
 #include "elm_flipselector_item.eo.h"
 
 /**
diff --git a/legacy/elementary/src/lib/elm_widget_gengrid.h b/legacy/elementary/src/lib/elm_widget_gengrid.h
index bb2ff2a8f0..e38156af77 100644
--- a/legacy/elementary/src/lib/elm_widget_gengrid.h
+++ b/legacy/elementary/src/lib/elm_widget_gengrid.h
@@ -10,7 +10,6 @@
  * IT AT RUNTIME.
  */
 
-#include "elm_object_item_migration_temp.h"
 /**
  * @addtogroup Widget
  * @{
diff --git a/legacy/elementary/src/lib/elm_widget_genlist.h b/legacy/elementary/src/lib/elm_widget_genlist.h
index a8e47ee5c3..94627bb963 100644
--- a/legacy/elementary/src/lib/elm_widget_genlist.h
+++ b/legacy/elementary/src/lib/elm_widget_genlist.h
@@ -10,7 +10,6 @@
  * IT AT RUNTIME.
  */
 
-#include "elm_object_item_migration_temp.h"
 /**
  * @addtogroup Widget
  * @{
diff --git a/legacy/elementary/src/lib/elm_widget_hoversel.h b/legacy/elementary/src/lib/elm_widget_hoversel.h
index d9b6fee6d6..74255a6385 100644
--- a/legacy/elementary/src/lib/elm_widget_hoversel.h
+++ b/legacy/elementary/src/lib/elm_widget_hoversel.h
@@ -4,7 +4,6 @@
 #include "Elementary.h"
 #include "elm_hoversel_item.eo.h"
 
-#include "elm_object_item_migration_temp.h"
 
 #include <Eio.h>
 
diff --git a/legacy/elementary/src/lib/elm_widget_index.h b/legacy/elementary/src/lib/elm_widget_index.h
index f0fd20bee9..381e3dee83 100644
--- a/legacy/elementary/src/lib/elm_widget_index.h
+++ b/legacy/elementary/src/lib/elm_widget_index.h
@@ -4,7 +4,6 @@
 #include "Elementary.h"
 #include "elm_index_item.eo.h"
 
-#include "elm_object_item_migration_temp.h"
 
 /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
  * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/legacy/elementary/src/lib/elm_widget_list.h b/legacy/elementary/src/lib/elm_widget_list.h
index 15ef82298b..6ddd4d88b3 100644
--- a/legacy/elementary/src/lib/elm_widget_list.h
+++ b/legacy/elementary/src/lib/elm_widget_list.h
@@ -10,7 +10,6 @@
  * IT AT RUNTIME.
  */
 
-#include "elm_object_item_migration_temp.h"
 /**
  * @addtogroup Widget
  * @{
diff --git a/legacy/elementary/src/lib/elm_widget_menu.h b/legacy/elementary/src/lib/elm_widget_menu.h
index 64c1b84ee3..067daa2770 100644
--- a/legacy/elementary/src/lib/elm_widget_menu.h
+++ b/legacy/elementary/src/lib/elm_widget_menu.h
@@ -8,7 +8,6 @@
  * FINAL. CALL elm_widget_api_check(ELM_INTERNAL_API_VERSION) TO CHECK
  * IT AT RUNTIME.
  */
-#include "elm_object_item_migration_temp.h"
 #include "elm_menu_item.eo.h"
 
 /**
diff --git a/legacy/elementary/src/lib/elm_widget_multibuttonentry.h b/legacy/elementary/src/lib/elm_widget_multibuttonentry.h
index 2216e0313b..ce4c657ac8 100644
--- a/legacy/elementary/src/lib/elm_widget_multibuttonentry.h
+++ b/legacy/elementary/src/lib/elm_widget_multibuttonentry.h
@@ -2,7 +2,6 @@
 #define ELM_WIDGET_MULTIBUTTONENTRY_H
 
 #include "elm_widget_layout.h"
-#include "elm_object_item_migration_temp.h"
 
 #include "elm_multibuttonentry_item.eo.h"
 
diff --git a/legacy/elementary/src/lib/elm_widget_naviframe.h b/legacy/elementary/src/lib/elm_widget_naviframe.h
index f74200c049..c02ad0519c 100644
--- a/legacy/elementary/src/lib/elm_widget_naviframe.h
+++ b/legacy/elementary/src/lib/elm_widget_naviframe.h
@@ -10,7 +10,6 @@
  * IT AT RUNTIME.
  */
 
-#include "elm_object_item_migration_temp.h"
 /**
  * @addtogroup Widget
  * @{
diff --git a/legacy/elementary/src/lib/elm_widget_popup.h b/legacy/elementary/src/lib/elm_widget_popup.h
index 682cb6ca47..95a1a696ba 100644
--- a/legacy/elementary/src/lib/elm_widget_popup.h
+++ b/legacy/elementary/src/lib/elm_widget_popup.h
@@ -10,7 +10,6 @@
  * IT AT RUNTIME.
  */
 
-#include "elm_object_item_migration_temp.h"
 /**
  * @addtogroup Widget
  * @{
diff --git a/legacy/elementary/src/lib/elm_widget_segment_control.h b/legacy/elementary/src/lib/elm_widget_segment_control.h
index c3225513da..0a53e1aecb 100644
--- a/legacy/elementary/src/lib/elm_widget_segment_control.h
+++ b/legacy/elementary/src/lib/elm_widget_segment_control.h
@@ -4,7 +4,6 @@
 #include "Elementary.h"
 #include "elm_segment_control_item.eo.h"
 
-#include "elm_object_item_migration_temp.h"
 
 /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
  * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/legacy/elementary/src/lib/elm_widget_slideshow.h b/legacy/elementary/src/lib/elm_widget_slideshow.h
index c29f7bf4bd..39a0b41d43 100644
--- a/legacy/elementary/src/lib/elm_widget_slideshow.h
+++ b/legacy/elementary/src/lib/elm_widget_slideshow.h
@@ -4,7 +4,6 @@
 #include "Elementary.h"
 #include "elm_slideshow_item.eo.h"
 
-#include "elm_object_item_migration_temp.h"
 
 /* DO NOT USE THIS HEADER UNLESS YOU ARE PREPARED FOR BREAKING OF YOUR
  * CODE. THIS IS ELEMENTARY'S INTERNAL WIDGET API (for now) AND IS NOT
diff --git a/legacy/elementary/src/lib/elm_widget_toolbar.h b/legacy/elementary/src/lib/elm_widget_toolbar.h
index 7ff93788bf..2bdd3292b0 100644
--- a/legacy/elementary/src/lib/elm_widget_toolbar.h
+++ b/legacy/elementary/src/lib/elm_widget_toolbar.h
@@ -9,7 +9,6 @@
  * IT AT RUNTIME.
  */
 
-#include "elm_object_item_migration_temp.h"
 /**
  * @addtogroup Widget
  * @{