diff --git a/src/bin/e_config_data.c b/src/bin/e_config_data.c
index bb1b6c865..8dd90339f 100644
--- a/src/bin/e_config_data.c
+++ b/src/bin/e_config_data.c
@@ -1,12 +1,4 @@
-#include <Eina.h>
-#include <Eet.h>
-#define E_TYPEDEFS
-#include "e_config_data.h"
-#undef E_TYPEDEFS
-#ifndef E_API
-# define E_API
-#endif
-#include "e_config_data.h"
+#include "e.h"
 
 static Eina_Hash *config_hash = NULL;
 
diff --git a/src/bin/e_imc_main.c b/src/bin/e_imc_main.c
index 563dbab7e..8c5adc296 100644
--- a/src/bin/e_imc_main.c
+++ b/src/bin/e_imc_main.c
@@ -1,19 +1,4 @@
-#include <Eina.h>
-#include <Eet.h>
-#include <Ecore_File.h>
-#define E_TYPEDEFS
-#include "e_config_data.h"
-#include "e_intl_data.h"
-#undef E_TYPEDEFS
-#ifndef E_API
-# define E_API
-#endif
-#ifndef EINTERN
-# define EINTERN
-#endif
-#include "e_config_data.h"
-#include "e_intl_data.h"
-
+#include "e.h"
 
 static void _e_help(void);
 
@@ -196,7 +181,7 @@ main(int argc, char **argv)
      }
 
    e_intl_input_method_config_free(read_imc);
-   free(write_imc);
+   E_FREE(write_imc);
    eet_close(ef);
    e_intl_data_shutdown();
    eet_shutdown();
diff --git a/src/bin/e_intl_data.c b/src/bin/e_intl_data.c
index 5580a3e22..bd02c8110 100644
--- a/src/bin/e_intl_data.c
+++ b/src/bin/e_intl_data.c
@@ -1,17 +1,4 @@
-#include <Eina.h>
-#include <Eet.h>
-#define E_TYPEDEFS
-#include "e_config_data.h"
-#include "e_intl_data.h"
-#undef E_TYPEDEFS
-#ifndef E_API
-# define E_API
-#endif
-#ifndef EINTERN
-# define EINTERN
-#endif
-#include "e_config_data.h"
-#include "e_intl_data.h"
+#include "e.h"
 
 /* This file is the counterpart for data storage of e_intl */
 /* This only needs to be separate because the e_imc binary and other third parties
@@ -82,7 +69,7 @@ e_intl_input_method_config_free(E_Input_Method_Config *imc)
         if (imc->ecore_imf_module) eina_stringshare_del(imc->ecore_imf_module);
         if (imc->e_im_exec) eina_stringshare_del(imc->e_im_exec);
         if (imc->e_im_setup_exec) eina_stringshare_del(imc->e_im_setup_exec);
-        free(imc);
+        E_FREE(imc);
      }
 }
 
diff --git a/src/bin/e_sha1.c b/src/bin/e_sha1.c
index 031ae378a..375b26477 100644
--- a/src/bin/e_sha1.c
+++ b/src/bin/e_sha1.c
@@ -1,13 +1,6 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "e.h"
 #include <string.h>
 
-#ifndef E_API
-#define E_API
-#endif
-
-
 #ifdef HAVE_ARPA_INET_H
 # include <arpa/inet.h>
 #endif
diff --git a/src/bin/e_user.c b/src/bin/e_user.c
index 5db97b5a7..e79717a6a 100644
--- a/src/bin/e_user.c
+++ b/src/bin/e_user.c
@@ -1,14 +1,4 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <Efreet.h>
-
-#ifndef E_API
-#define E_API
-#endif
+#include "e.h"
 
 static const char *_e_user_homedir = NULL;
 static size_t _e_user_homedir_len = 0;