diff --git a/src/bin/e.h b/src/bin/e.h
index 0a533c3fd..d20259163 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -4,6 +4,7 @@
 #ifndef E_H
 #define E_H
 
+#include "config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -23,6 +24,23 @@
 #include <pwd.h>
 #include <grp.h>
 #include <glob.h>
+#include <locale.h>
+#include <libintl.h>
+#include <errno.h>
+
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+
+#ifdef HAVE_VALGRIND
+# include <memcheck.h>
+#endif
+
+#ifdef OBJECT_PARANOIA_CHECK
+#include <execinfo.h>
+#include <signal.h>
+#include <setjmp.h>
+#endif
 
 #include <Evas.h>
 #include <Evas_Engine_Buffer.h>
@@ -40,14 +58,6 @@
 #include <Eet.h>
 #include <Edje.h>
 
-#ifdef USE_E_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
-
 #if HAVE___ATTRIBUTE__
 #define __UNUSED__ __attribute__((unused))
 #else
@@ -66,7 +76,7 @@
 #else
 # ifdef __GNUC__
 #  if __GNUC__ >= 4
-#   pragma GCC visibility push(hidden)
+/*#   pragma GCC visibility push(hidden)*/
 #   define EAPI __attribute__ ((visibility("default")))
 #  else
 #   define EAPI
diff --git a/src/bin/e_alert.c b/src/bin/e_alert.c
index 0f2b3e3ae..292c6fdbf 100644
--- a/src/bin/e_alert.c
+++ b/src/bin/e_alert.c
@@ -2,6 +2,7 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e_alert.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
diff --git a/src/bin/e_apps.c b/src/bin/e_apps.c
index 469e6addd..2532b313b 100644
--- a/src/bin/e_apps.c
+++ b/src/bin/e_apps.c
@@ -2,7 +2,7 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
-#include <errno.h>
+
 /* TODO List:
  * 
  * - We assume only .eap files in 'all', no subdirs
diff --git a/src/bin/e_hints.c b/src/bin/e_hints.c
index 05c6754a6..e0ddc1137 100644
--- a/src/bin/e_hints.c
+++ b/src/bin/e_hints.c
@@ -2,7 +2,6 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
-#include "config.h"
 
 EAPI void
 e_hints_init(void)
diff --git a/src/bin/e_imc_main.c b/src/bin/e_imc_main.c
index c0ca650da..67ffe4d9b 100644
--- a/src/bin/e_imc_main.c
+++ b/src/bin/e_imc_main.c
@@ -2,9 +2,8 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
-#include <errno.h>
 
-extern int errno;
+//extern int errno;
 static void _e_help(void);
 
 /* externally accessible functions */
diff --git a/src/bin/e_int_menus.c b/src/bin/e_int_menus.c
index 53dc43e08..2b5391a01 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_intl.c b/src/bin/e_intl.c
index edcd04e7e..ed6383767 100644
--- a/src/bin/e_intl.c
+++ b/src/bin/e_intl.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_intl.h b/src/bin/e_intl.h
index 06758d2ab..fa6649abd 100644
--- a/src/bin/e_intl.h
+++ b/src/bin/e_intl.h
@@ -3,9 +3,6 @@
  */
 #ifdef E_TYPEDEFS
 
-#include <locale.h>
-#include <libintl.h>
-
 #define _(str) gettext(str)
 #define d_(str, dom) dgettext(PACKAGE dom, str)
 
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 5790caef3..5b7db5256 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));
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 8a626cac4..3ab2a5420 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -2,11 +2,6 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
-#include "config.h"
-
-#ifdef HAVE_VALGRIND
-# include <memcheck.h>
-#endif
 
 /* TODO List:
  * 
diff --git a/src/bin/e_object.c b/src/bin/e_object.c
index fbff4b3fc..08fccaad3 100644
--- a/src/bin/e_object.c
+++ b/src/bin/e_object.c
@@ -17,10 +17,6 @@
 /* yes - i know. glibc specific... but i like being able to do my own */
 /* backtraces! NB: you need CFLAGS="-rdynamic -g" LDFLAGS="-rdynamic -g" */
 #ifdef OBJECT_PARANOIA_CHECK
-#include <execinfo.h>
-#include <stdio.h>
-#include <signal.h>
-#include <setjmp.h>
 
 /* local subsystem functions */
 static void _e_object_segv(int sig);
diff --git a/src/bin/e_prefix.c b/src/bin/e_prefix.c
index d2d42ba42..e991e9c4f 100644
--- a/src/bin/e_prefix.c
+++ b/src/bin/e_prefix.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 int _e_prefix_fallbacks(void);
diff --git a/src/bin/e_signals.c b/src/bin/e_signals.c
index 8dc321600..f0aef3795 100644
--- a/src/bin/e_signals.c
+++ b/src/bin/e_signals.c
@@ -7,7 +7,6 @@
 #include "e.h"
 
 #ifdef OBJECT_PARANOIA_CHECK   
-#include <execinfo.h>
 
 /* a tricky little devil, requires e and it's libs to be built
  * with the -rdynamic flag to GCC for any sort of decent output. 
diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index ae612f618..c39b7c744 100644
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -2,7 +2,6 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
-#include "config.h"
 
 /* E_Zone is a child object of E_Container. There is one zone per screen
  * in a xinerama setup. Each zone has one or more desktops.