diff --git a/legacy/efreet/src/bin/ef_cache.c b/legacy/efreet/src/bin/ef_cache.c
index f3f693ab15..45ffd80e56 100644
--- a/legacy/efreet/src/bin/ef_cache.c
+++ b/legacy/efreet/src/bin/ef_cache.c
@@ -1,8 +1,9 @@
 #include "Efreet.h"
 #include <stdio.h>
+#include "ef_test.h"
 
 static int
-timer(void *data)
+timer(void *data __UNUSED__)
 {
     Ecore_List *list;
     Efreet_Desktop *desktop;
@@ -33,7 +34,7 @@ timer(void *data)
 }
 
 int
-main(int argc, char **argv)
+main(int argc __UNUSED__, char **argv __UNUSED__)
 {
     if (!efreet_init()) return 1;
     if (!efreet_util_init()) return 1;
diff --git a/legacy/efreet/src/bin/ef_desktop.c b/legacy/efreet/src/bin/ef_desktop.c
index 8494a470b9..b618fcd42d 100644
--- a/legacy/efreet/src/bin/ef_desktop.c
+++ b/legacy/efreet/src/bin/ef_desktop.c
@@ -5,9 +5,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <limits.h>
-
-#define IF_FREE(x) do { if (x) free(x); x = NULL; } while (0);
-#define NEW(x, c) calloc(c, sizeof(x))
+#include "ef_test.h"
 
 static void *_cb_command(void *data, Efreet_Desktop *desktop, char *exec, int remaining);
 
@@ -327,7 +325,8 @@ ef_cb_desktop_command_get(void)
 }
 
 static void *
-_cb_command(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
+_cb_command(void *data, Efreet_Desktop *desktop __UNUSED__,
+            char *exec, int remaining __UNUSED__)
 {
   Test_Info *info = data;
   char *expected;
@@ -352,7 +351,7 @@ _cb_command(void *data, Efreet_Desktop *desktop, char *exec, int remaining)
 }
 
 static void *
-cb_type_parse(Efreet_Desktop *desktop, Efreet_Ini *ini)
+cb_type_parse(Efreet_Desktop *desktop __UNUSED__, Efreet_Ini *ini)
 {
     const char *val;
     val = efreet_ini_string_get(ini, "X-Test");
diff --git a/legacy/efreet/src/bin/ef_test.h b/legacy/efreet/src/bin/ef_test.h
new file mode 100644
index 0000000000..05927111c9
--- /dev/null
+++ b/legacy/efreet/src/bin/ef_test.h
@@ -0,0 +1,15 @@
+#ifndef EF_TEST
+#define EF_TEST
+
+#include "config.h"
+
+#if HAVE___ATTRIBUTE__
+#define __UNUSED__ __attribute__((unused))
+#else
+#define __UNUSED__
+#endif
+
+#define IF_FREE(x) do { if (x) free(x); x = NULL; } while (0);
+#define NEW(x, c) calloc(c, sizeof(x))
+
+#endif
diff --git a/legacy/efreet/src/bin/efreet_spec_test.c b/legacy/efreet/src/bin/efreet_spec_test.c
index 4fb1b24dcd..a5ef2a60e8 100644
--- a/legacy/efreet/src/bin/efreet_spec_test.c
+++ b/legacy/efreet/src/bin/efreet_spec_test.c
@@ -1,12 +1,13 @@
 #include <Efreet.h>
 #include <stdio.h>
+#include "ef_test.h"
 
 #define PATH_MAX 4096
 
 static void dump(Efreet_Menu *menu, const char *path);
 
 int
-main(int argc, char **argv)
+main(int argc __UNUSED__, char **argv __UNUSED__)
 {
     Efreet_Menu *menu;
 
diff --git a/legacy/efreet/src/lib/efreet_ini.c b/legacy/efreet/src/lib/efreet_ini.c
index c7254ca68e..7a4692b44a 100644
--- a/legacy/efreet/src/lib/efreet_ini.c
+++ b/legacy/efreet/src/lib/efreet_ini.c
@@ -73,7 +73,6 @@ efreet_ini_parse(const char *file)
     FILE *f;
     Ecore_Hash *data, *section = NULL;
     struct stat file_stat;
-    int buffer_length;
     int line_length;
     int left;