diff --git a/legacy/edje/src/lib/edje_cache.c b/legacy/edje/src/lib/edje_cache.c
index 6fa66a073f..b2a0f8c1ca 100644
--- a/legacy/edje/src/lib/edje_cache.c
+++ b/legacy/edje/src/lib/edje_cache.c
@@ -1,27 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
-
-#include <string.h>
-#include <sys/stat.h>
-
 #include "edje_private.h"
 
 
diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c
index 364c7a5efc..be21e17ff3 100644
--- a/legacy/edje/src/lib/edje_calc.c
+++ b/legacy/edje/src/lib/edje_calc.c
@@ -1,6 +1,3 @@
-#include <string.h>
-#include <math.h>
-
 #include "edje_private.h"
 
 #define FLAG_NONE 0
diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c
index 184211e5e6..22bcebfd38 100644
--- a/legacy/edje/src/lib/edje_edit.c
+++ b/legacy/edje/src/lib/edje_edit.c
@@ -7,27 +7,6 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-#include <limits.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-#ifndef _MSC_VER
-# include <unistd.h>
-#endif
-
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-#ifdef HAVE_EVIL
-# include <Evil.h>
-#endif
-
 #include "edje_private.h"
 
 #define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT
diff --git a/legacy/edje/src/lib/edje_embryo.c b/legacy/edje/src/lib/edje_embryo.c
index 9c602edd1a..f9d34409dc 100644
--- a/legacy/edje/src/lib/edje_embryo.c
+++ b/legacy/edje/src/lib/edje_embryo.c
@@ -1,26 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
-
 #include "edje_private.h"
 
 /*
diff --git a/legacy/edje/src/lib/edje_entry.c b/legacy/edje/src/lib/edje_entry.c
index d273e03662..bfd5817982 100644
--- a/legacy/edje/src/lib/edje_entry.c
+++ b/legacy/edje/src/lib/edje_entry.c
@@ -1,30 +1,6 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
-
 #include "edje_private.h"
 
 #ifdef HAVE_ECORE_IMF
-#include <Ecore_IMF_Evas.h>
 
 static int _edje_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx, char **text, int *cursor_pos);
 static Eina_Bool _edje_entry_imf_event_commit_cb(void *data, int type, void *event);
diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c
index 325af02e66..660eff05cf 100644
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/src/lib/edje_load.c
@@ -1,5 +1,3 @@
-#include <string.h>
-
 #include "edje_private.h"
 
 #ifdef EDJE_PROGRAM_CACHE
diff --git a/legacy/edje/src/lib/edje_lua.c b/legacy/edje/src/lib/edje_lua.c
index a99c364b3a..7b599b9731 100644
--- a/legacy/edje/src/lib/edje_lua.c
+++ b/legacy/edje/src/lib/edje_lua.c
@@ -1,26 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca(size_t);
-#endif
-
 #include "edje_private.h"
 
 #if 0
diff --git a/legacy/edje/src/lib/edje_lua2.c b/legacy/edje/src/lib/edje_lua2.c
index 406c2603d9..8484dd54e8 100644
--- a/legacy/edje/src/lib/edje_lua2.c
+++ b/legacy/edje/src/lib/edje_lua2.c
@@ -158,28 +158,6 @@
  * @endcode
  * 
  */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#include <string.h>
-
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-  void *alloca(size_t);
-#endif
 
 #include "edje_private.h"
 
diff --git a/legacy/edje/src/lib/edje_lua_script_only.c b/legacy/edje/src/lib/edje_lua_script_only.c
index e3268ec12d..e283c83329 100644
--- a/legacy/edje/src/lib/edje_lua_script_only.c
+++ b/legacy/edje/src/lib/edje_lua_script_only.c
@@ -1,24 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca(size_t);
-#endif
-
 #include "edje_private.h"
 
 Eina_Bool
diff --git a/legacy/edje/src/lib/edje_main.c b/legacy/edje/src/lib/edje_main.c
index bf0c1886b8..6ac0221d0c 100644
--- a/legacy/edje/src/lib/edje_main.c
+++ b/legacy/edje/src/lib/edje_main.c
@@ -1,5 +1,3 @@
-#include <time.h>
-
 #include "edje_private.h"
 
 static Edje_Version _version = { VMAJ, VMIN, VMIC, VREV };
diff --git a/legacy/edje/src/lib/edje_match.c b/legacy/edje/src/lib/edje_match.c
index caa7084408..8bf7d070b2 100644
--- a/legacy/edje/src/lib/edje_match.c
+++ b/legacy/edje/src/lib/edje_match.c
@@ -1,5 +1,3 @@
-#include <string.h>
-
 #include "edje_private.h"
 
 /* States manipulations. */
diff --git a/legacy/edje/src/lib/edje_message_queue.c b/legacy/edje/src/lib/edje_message_queue.c
index a66ad4b74a..8640f76d2e 100644
--- a/legacy/edje/src/lib/edje_message_queue.c
+++ b/legacy/edje/src/lib/edje_message_queue.c
@@ -1,5 +1,3 @@
-#include <string.h>
-
 #include "edje_private.h"
 
 static int _injob = 0;
diff --git a/legacy/edje/src/lib/edje_module.c b/legacy/edje/src/lib/edje_module.c
index 915d6a06a8..64992906cd 100644
--- a/legacy/edje/src/lib/edje_module.c
+++ b/legacy/edje/src/lib/edje_module.c
@@ -1,37 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <libgen.h>
-
-#ifdef HAVE_EVIL
-# include <Evil.h>
-#endif
-
-#include <Eina.h>
-#include <Ecore_File.h>
-
-#include "Edje.h"
 #include "edje_private.h"
 
 Eina_Hash *_registered_modules = NULL;
diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h
index 8ffc14174e..7c70ca65c1 100644
--- a/legacy/edje/src/lib/edje_private.h
+++ b/legacy/edje/src/lib/edje_private.h
@@ -5,6 +5,10 @@
 # include <config.h>
 #endif
 
+#ifndef _WIN32
+# define _GNU_SOURCE
+#endif
+
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
 #elif defined __GNUC__
@@ -19,28 +23,44 @@
 void *alloca (size_t);
 #endif
 
-#ifdef HAVE_EVIL
-# include <Evil.h>
-#endif
-
-#include <Eina.h>
-#include <Evas.h>
-#include <Ecore.h>
-#ifdef HAVE_ECORE_IMF
-# include <Ecore_IMF.h>
-#endif
-#include <Eet.h>
-#include <Embryo.h>
+#include <string.h>
+#include <limits.h>
+#include <sys/stat.h>
 #include <time.h>
 #include <sys/time.h>
-
-#include "Edje.h"
+#include <errno.h>
+#include <libgen.h>
 
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 #include <setjmp.h>
 
+#ifndef _MSC_VER
+# include <unistd.h>
+#endif
+
+#ifdef HAVE_LOCALE_H
+# include <locale.h>
+#endif
+
+#ifdef HAVE_EVIL
+# include <Evil.h>
+#endif
+
+#include <Eina.h>
+#include <Eet.h>
+#include <Evas.h>
+#include <Ecore.h>
+#include <Ecore_File.h>
+#ifdef HAVE_ECORE_IMF
+# include <Ecore_IMF.h>
+# include <Ecore_IMF_Evas.h>
+#endif
+#include <Embryo.h>
+
+#include "Edje.h"
+
 EAPI extern int _edje_default_log_dom ; 
 
 #ifdef EDJE_DEFAULT_LOG_COLOR
diff --git a/legacy/edje/src/lib/edje_program.c b/legacy/edje/src/lib/edje_program.c
index 45a3a2bff5..209af77646 100644
--- a/legacy/edje/src/lib/edje_program.c
+++ b/legacy/edje/src/lib/edje_program.c
@@ -1,30 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifndef _WIN32
-# define _GNU_SOURCE
-#endif
-
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca (size_t);
-#endif
-
-#include <string.h>
-
 #include "edje_private.h"
 
 static void _edje_emit_cb(Edje *ed, const char *sig, const char *src);
diff --git a/legacy/edje/src/lib/edje_script_only.c b/legacy/edje/src/lib/edje_script_only.c
index 6a57c02b9b..bd5c0f06f4 100644
--- a/legacy/edje/src/lib/edje_script_only.c
+++ b/legacy/edje/src/lib/edje_script_only.c
@@ -1,24 +1,3 @@
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-#ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-#elif defined __GNUC__
-# define alloca __builtin_alloca
-#elif defined _AIX
-# define alloca __alloca
-#elif defined _MSC_VER
-# include <malloc.h>
-# define alloca _alloca
-#else
-# include <stddef.h>
-# ifdef  __cplusplus
-extern "C"
-# endif
-void *alloca(size_t);
-#endif
-
 #include "edje_private.h"
 
 /*
diff --git a/legacy/edje/src/lib/edje_text.c b/legacy/edje/src/lib/edje_text.c
index 2fdb0c53eb..a37ad10dec 100644
--- a/legacy/edje/src/lib/edje_text.c
+++ b/legacy/edje/src/lib/edje_text.c
@@ -1,5 +1,3 @@
-#include <string.h>
-
 #include "edje_private.h"
 
 
diff --git a/legacy/edje/src/lib/edje_textblock_styles.c b/legacy/edje/src/lib/edje_textblock_styles.c
index d2013af721..13a68ada91 100644
--- a/legacy/edje/src/lib/edje_textblock_styles.c
+++ b/legacy/edje/src/lib/edje_textblock_styles.c
@@ -1,5 +1,3 @@
-#include <string.h>
-
 #include "edje_private.h"
 
 static int
diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index 994eb92035..b7dd24a7eb 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -1,6 +1,3 @@
-#include <string.h>
-#include <ctype.h>
-
 #include "edje_private.h"
 
 typedef struct _Edje_Box_Layout Edje_Box_Layout;
diff --git a/legacy/edje/src/lib/edje_var.c b/legacy/edje/src/lib/edje_var.c
index 2bd87e496a..3031355631 100644
--- a/legacy/edje/src/lib/edje_var.c
+++ b/legacy/edje/src/lib/edje_var.c
@@ -1,5 +1,3 @@
-#include <string.h>
-
 #include "edje_private.h"
 
 static Eina_Bool _edje_var_timer_cb(void *data);