diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 73a909c3a..f140f3995 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -2,7 +2,6 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
-#include "config.h"
 
 /* TODO List
  *
diff --git a/src/bin/e_font.c b/src/bin/e_font.c
index a8859788d..53debbb84 100644
--- a/src/bin/e_font.c
+++ b/src/bin/e_font.c
@@ -2,7 +2,6 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
-#include "config.h"
 
 /* TODO List:
  * - export to libe
diff --git a/src/bin/e_init.c b/src/bin/e_init.c
index d9ad64599..100555d97 100644
--- a/src/bin/e_init.c
+++ b/src/bin/e_init.c
@@ -20,7 +20,7 @@ static Evas_List *_e_init_icon_list = NULL;
 int
 e_init_init(void)
 {
-   int x, y, w, h;
+   int w, h;
    Ecore_X_Window root;
    Ecore_X_Window *roots;
    int num;
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index b0ade4933..a8decba01 100644
--- a/src/bin/e_int_menus.c
+++ b/src/bin/e_int_menus.c
@@ -2,7 +2,6 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
-#include "config.h"
 
 typedef struct _Main_Data Main_Data;
 
diff --git a/src/bin/e_ipc.c b/src/bin/e_ipc.c
index 89b64cdd3..4bdc499da 100644
--- a/src/bin/e_ipc.c
+++ b/src/bin/e_ipc.c
@@ -1,5 +1,4 @@
 #include "e.h"
-#include "config.h"
 
 /* local subsystem functions */
 static int _e_ipc_cb_client_add(void *data, int type, void *event);
@@ -40,7 +39,7 @@ e_ipc_shutdown(void)
 
 /* local subsystem globals */
 static int
-_e_ipc_cb_client_add(void *data, int type, void *event)
+_e_ipc_cb_client_add(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Ipc_Event_Client_Add *e;
    
@@ -51,7 +50,7 @@ _e_ipc_cb_client_add(void *data, int type, void *event)
 }
 
 static int
-_e_ipc_cb_client_del(void *data, int type, void *event)
+_e_ipc_cb_client_del(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Ipc_Event_Client_Del *e;
    
@@ -64,7 +63,7 @@ _e_ipc_cb_client_del(void *data, int type, void *event)
 }
 
 static int
-_e_ipc_cb_client_data(void *data, int type, void *event)
+_e_ipc_cb_client_data(void *data __UNUSED__, int type __UNUSED__, void *event)
 {
    Ecore_Ipc_Event_Client_Data *e;
    
@@ -541,7 +540,6 @@ _e_ipc_path_str_get(char **paths, int *bytes)
    home = e_user_homedir_get();
    for (cur = paths; *cur != NULL; cur++)
      {
-	int len;
 	char *p;
 
 	p = *cur;
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 1a02b6bdc..191b1cb47 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -2,7 +2,6 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
-#include "config.h"
 
 /* local subsystem functions */
 static void _e_main_shutdown_push(int (*func)(void));
@@ -711,7 +710,7 @@ _e_main_ipc_shutdown(void)
 }
 
 static void
-_e_main_cb_x_fatal(void *data)
+_e_main_cb_x_fatal(void *data __UNUSED__)
 {
    e_error_gui_set(0);
    e_error_message_show("Lost X connection.");
@@ -720,7 +719,7 @@ _e_main_cb_x_fatal(void *data)
 }
 
 static int
-_e_main_cb_signal_exit(void *data, int ev_type, void *ev)
+_e_main_cb_signal_exit(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
 {
    /* called on ctrl-c, kill (pid) (also SIGINT, SIGTERM and SIGQIT) */
    ecore_main_loop_quit();
@@ -728,7 +727,7 @@ _e_main_cb_signal_exit(void *data, int ev_type, void *ev)
 }
 
 static int
-_e_main_cb_signal_hup(void *data, int ev_type, void *ev)
+_e_main_cb_signal_hup(void *data __UNUSED__, int ev_type __UNUSED__, void *ev __UNUSED__)
 {
    /* called on SIGHUP to restart Enlightenment */
    printf("RESTART ON!\n");
@@ -738,14 +737,14 @@ _e_main_cb_signal_hup(void *data, int ev_type, void *ev)
 }
 
 static int
-_e_main_cb_x_flusher(void *data)
+_e_main_cb_x_flusher(void *data __UNUSED__)
 {
    ecore_x_flush();
    return 1;
 }
 
 static int
-_e_main_cb_idler_before(void *data)
+_e_main_cb_idler_before(void *data __UNUSED__)
 {
    Evas_List *l, *pl;
    
@@ -782,7 +781,7 @@ _e_main_cb_idler_before(void *data)
 }
 
 static int
-_e_main_cb_idler_after(void *data)
+_e_main_cb_idler_after(void *data __UNUSED__)
 {
 //   printf("OUT of idle... %3.3f\n", ecore_time_get());
    edje_freeze();
@@ -797,7 +796,7 @@ _e_main_cb_startup_fake_status(void *data)
 }
 
 static int
-_e_main_cb_startup_fake_end(void *data)
+_e_main_cb_startup_fake_end(void *data __UNUSED__)
 {
    e_init_hide();
    return 0;
diff --git a/src/bin/e_manager.c b/src/bin/e_manager.c
index e1616c3f1..b13050932 100644
--- a/src/bin/e_manager.c
+++ b/src/bin/e_manager.c
@@ -390,7 +390,7 @@ _e_manager_free(E_Manager *man)
 }
 
 static int
-_e_manager_cb_window_show_request(void *data, int ev_type, void *ev)
+_e_manager_cb_window_show_request(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    E_Manager *man;
    Ecore_X_Event_Window_Show_Request *e;
@@ -419,7 +419,7 @@ _e_manager_cb_window_show_request(void *data, int ev_type, void *ev)
 }
 
 static int
-_e_manager_cb_window_configure(void *data, int ev_type, void *ev)
+_e_manager_cb_window_configure(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
 {
    E_Manager *man;
    Ecore_X_Event_Window_Configure *e;
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 5c4c641f5..7c5ab9ed4 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -2,7 +2,6 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
-#include "config.h"
 
 /* TODO List:
  * 
diff --git a/src/bin/e_path.c b/src/bin/e_path.c
index dd7a8d3be..d152960d5 100644
--- a/src/bin/e_path.c
+++ b/src/bin/e_path.c
@@ -229,7 +229,7 @@ _e_path_cache_free(E_Path *ep)
 }
 
 static Evas_Bool
-_e_path_cache_free_cb(Evas_Hash *hash, const char *key, void *data, void *fdata)
+_e_path_cache_free_cb(Evas_Hash *hash __UNUSED__, const char *key __UNUSED__, void *data, void *fdata __UNUSED__)
 {
    free(data);
    return 0;
diff --git a/src/lib/e_main.c b/src/lib/e_main.c
index ae8bcaa55..abe3d7860 100644
--- a/src/lib/e_main.c
+++ b/src/lib/e_main.c
@@ -258,7 +258,7 @@ _e_ipc_shutdown(void)
 }
 
 static int
-_e_cb_server_data(void *data, int type, void *event)
+_e_cb_server_data(void *data __UNUSED__, int type, void *event)
 {
    Ecore_Ipc_Event_Server_Data *e;
    
@@ -386,7 +386,7 @@ _e_cb_server_data(void *data, int type, void *event)
    return 1;
 }
 
-static void _e_cb_module_list_free(void *data, void *ev)
+static void _e_cb_module_list_free(void *data __UNUSED__, void *ev)
 {
     E_Response_Module_List *e;
     int i;
@@ -401,7 +401,7 @@ static void _e_cb_module_list_free(void *data, void *ev)
 }
 
 static void
-_e_cb_module_dir_list_free(void *data, void *ev)
+_e_cb_module_dir_list_free(void *data __UNUSED__, void *ev)
 {
     E_Response_Module_Dirs_List *e;
     
@@ -411,7 +411,7 @@ _e_cb_module_dir_list_free(void *data, void *ev)
 }
 
 static void
-_e_cb_bg_dir_list_free(void *data, void *ev)
+_e_cb_bg_dir_list_free(void *data __UNUSED__, void *ev)
 {
     E_Response_Background_Dirs_List *e;
 
diff --git a/src/lib/e_private.h b/src/lib/e_private.h
index 9bd58acf0..f69f9ec18 100644
--- a/src/lib/e_private.h
+++ b/src/lib/e_private.h
@@ -5,6 +5,12 @@
 #include <config.h>
 #endif
 
+#if HAVE___ATTRIBUTE__
+#define __UNUSED__ __attribute__((unused))
+#else
+#define __UNUSED__
+#endif
+
 #define E_TYPEDEFS 1
 #include "e_ipc.h"
 #undef E_TYPEDEFS