diff --git a/legacy/ecore/src/lib/ecore/ecore_private.h b/legacy/ecore/src/lib/ecore/ecore_private.h
index 50ae9b95c2..cabf045abf 100644
--- a/legacy/ecore/src/lib/ecore/ecore_private.h
+++ b/legacy/ecore/src/lib/ecore/ecore_private.h
@@ -17,6 +17,8 @@
 #include <limits.h>
 #include <dirent.h>
 
+#include <eina_types.h>
+
 #ifdef HAVE_SYS_MMAN_H
 # include <sys/mman.h>
 #endif
@@ -54,12 +56,6 @@
 # endif
 #endif
 
-#if HAVE___ATTRIBUTE__
-# define __UNUSED__ __attribute__((unused))
-#else
-# define __UNUSED__
-#endif
-
 #ifndef PATH_MAX
 # define PATH_MAX 4096
 #endif
diff --git a/legacy/efreet/src/bin/ef_test.h b/legacy/efreet/src/bin/ef_test.h
index 05927111c9..2e88c68d25 100644
--- a/legacy/efreet/src/bin/ef_test.h
+++ b/legacy/efreet/src/bin/ef_test.h
@@ -3,11 +3,7 @@
 
 #include "config.h"
 
-#if HAVE___ATTRIBUTE__
-#define __UNUSED__ __attribute__((unused))
-#else
-#define __UNUSED__
-#endif
+#include <eina_types.h>
 
 #define IF_FREE(x) do { if (x) free(x); x = NULL; } while (0);
 #define NEW(x, c) calloc(c, sizeof(x))
diff --git a/legacy/efreet/src/lib/efreet_private.h b/legacy/efreet/src/lib/efreet_private.h
index a1cd803d90..45e834c931 100644
--- a/legacy/efreet/src/lib/efreet_private.h
+++ b/legacy/efreet/src/lib/efreet_private.h
@@ -29,10 +29,10 @@
 #include <alloca.h>
 #endif
 
+#include <Eina.h>
 #include <Ecore.h>
 #include <Ecore_File.h>
 #include <Ecore_Str.h>
-#include <eina_stringshare.h>
 
 #include "efreet_xml.h"
 #include "efreet_ini.h"
@@ -99,16 +99,6 @@
     (x) = NULL; \
 } while (0)
 
-/**
- * @def __UNUSED__
- * A flag to mark a function parameter as unused
- */
-#if HAVE___ATTRIBUTE__
-#define __UNUSED__ __attribute__((unused))
-#else
-#define __UNUSED__
-#endif
-
 #ifndef PATH_MAX
 /**
  * @def PATH_MAX
diff --git a/legacy/embryo/src/bin/embryo_cc_sc.h b/legacy/embryo/src/bin/embryo_cc_sc.h
index 53a4992ac0..7fba24804c 100644
--- a/legacy/embryo/src/bin/embryo_cc_sc.h
+++ b/legacy/embryo/src/bin/embryo_cc_sc.h
@@ -35,15 +35,12 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <setjmp.h>
+
+#include <eina_types.h>
+
 #include "embryo_cc_osdefs.h"
 #include "embryo_cc_amx.h"
 
-#if HAVE___ATTRIBUTE__
-#define __UNUSED__ __attribute__((unused))
-#else
-#define __UNUSED__
-#endif
-
 /* Note: the "cell" and "ucell" types are defined in AMX.H */
 
 #define PUBLIC_CHAR '@'		/* character that defines a function "public" */
diff --git a/legacy/embryo/src/lib/embryo_private.h b/legacy/embryo/src/lib/embryo_private.h
index 0a0511c07b..a88cd26f8e 100644
--- a/legacy/embryo/src/lib/embryo_private.h
+++ b/legacy/embryo/src/lib/embryo_private.h
@@ -30,6 +30,8 @@ extern "C"
 void *alloca (size_t);
 #endif
 
+#include <eina_types.h>
+
 #include "Embryo.h"
 
 #ifdef __GNUC__
@@ -39,12 +41,6 @@ void *alloca (size_t);
 # endif
 #endif
 
-#if HAVE___ATTRIBUTE__
-#define __UNUSED__ __attribute__((unused))
-#else
-#define __UNUSED__
-#endif
-
 typedef enum _Embryo_Opcode Embryo_Opcode;
 
 enum _Embryo_Opcode