diff --git a/legacy/efreet/src/lib/efreet_base.h b/legacy/efreet/src/lib/efreet_base.h
index d6b9f243c2..d273fe242a 100644
--- a/legacy/efreet/src/lib/efreet_base.h
+++ b/legacy/efreet/src/lib/efreet_base.h
@@ -12,8 +12,7 @@
  * @{
  */
 
-#include <Ecore.h>
-#include <Ecore_Data.h>
+#include <Eina.h>
 
 EAPI const char *efreet_data_home_get(void);
 EAPI Eina_List *efreet_data_dirs_get(void);
diff --git a/legacy/efreet/src/lib/efreet_desktop.h b/legacy/efreet/src/lib/efreet_desktop.h
index f301463cd6..a579d423ad 100644
--- a/legacy/efreet/src/lib/efreet_desktop.h
+++ b/legacy/efreet/src/lib/efreet_desktop.h
@@ -12,6 +12,8 @@
  * @{
  */
 
+#include <Eina.h>
+
 EAPI extern int EFREET_DESKTOP_TYPE_APPLICATION;
 EAPI extern int EFREET_DESKTOP_TYPE_LINK;
 EAPI extern int EFREET_DESKTOP_TYPE_DIRECTORY;
diff --git a/legacy/efreet/src/lib/efreet_icon.h b/legacy/efreet/src/lib/efreet_icon.h
index 18ce0ddd9c..26d35e694d 100644
--- a/legacy/efreet/src/lib/efreet_icon.h
+++ b/legacy/efreet/src/lib/efreet_icon.h
@@ -12,6 +12,8 @@
  * @{
  */
 
+#include <Eina.h>
+
 /**
  * The possible contexts for an icon directory
  */
diff --git a/legacy/efreet/src/lib/efreet_menu.h b/legacy/efreet/src/lib/efreet_menu.h
index a6643d3d26..9218139f1c 100644
--- a/legacy/efreet/src/lib/efreet_menu.h
+++ b/legacy/efreet/src/lib/efreet_menu.h
@@ -12,6 +12,8 @@
  * @{
  */
 
+#include <Eina.h>
+
 /**
  * The type of entry
  */
diff --git a/legacy/efreet/src/lib/efreet_mime.c b/legacy/efreet/src/lib/efreet_mime.c
index 176a6d5048..b758f651a5 100644
--- a/legacy/efreet/src/lib/efreet_mime.c
+++ b/legacy/efreet/src/lib/efreet_mime.c
@@ -1,6 +1,5 @@
 /* vim: set sw=4 ts=4 sts=4 et: */
 #include <Efreet.h>
-#include <Ecore_Data.h>
 #include <Efreet_Mime.h>
 #include "efreet_private.h"
 #include <arpa/inet.h>
diff --git a/legacy/efreet/src/lib/efreet_uri.h b/legacy/efreet/src/lib/efreet_uri.h
index 6b8548b8ff..c7d4070b3b 100644
--- a/legacy/efreet/src/lib/efreet_uri.h
+++ b/legacy/efreet/src/lib/efreet_uri.h
@@ -10,7 +10,6 @@
  */
 
 #include <Ecore.h>
-#include <Ecore_Data.h>
 
 
 /**
diff --git a/legacy/efreet/src/lib/efreet_utils.h b/legacy/efreet/src/lib/efreet_utils.h
index eb21b5fee5..eb3f90180a 100644
--- a/legacy/efreet/src/lib/efreet_utils.h
+++ b/legacy/efreet/src/lib/efreet_utils.h
@@ -2,6 +2,8 @@
 #ifndef EFREET_UTILS_H
 #define EFREET_UTILS_H
 
+#include <Eina.h>
+
 typedef enum _Efreet_Desktop_Change Efreet_Desktop_Change;
 
 enum _Efreet_Desktop_Change