diff --git a/legacy/ecore/src/lib/ecore/Makefile.am b/legacy/ecore/src/lib/ecore/Makefile.am
index ee2c9cb630..9e86c87c4f 100644
--- a/legacy/ecore/src/lib/ecore/Makefile.am
+++ b/legacy/ecore/src/lib/ecore/Makefile.am
@@ -21,6 +21,7 @@ ecore_anim.c \
 ecore_app.c \
 ecore_events.c \
 ecore_getopt.c \
+ecore_glib.c \
 ecore_idle_enterer.c \
 ecore_idle_exiter.c \
 ecore_idler.c \
@@ -31,7 +32,6 @@ ecore_poll.c \
 ecore_time.c \
 ecore_timer.c \
 ecore_thread.c \
-ecore_glib.c \
 ecore_throttle.c \
 ecore_private.h
 
@@ -69,5 +69,5 @@ endif
 
 endif
 
-libecore_la_LIBADD = @dlopen_libs@ @EINA_LIBS@ @EVIL_LIBS@ @GLIB_LIBS@ @WIN32_LIBS@ @LTLIBINTL@ @EFL_PTHREAD_LIBS@ @rt_libs@ -lm
+libecore_la_LIBADD = @EINA_LIBS@ @EVIL_LIBS@ @GLIB_LIBS@ @WIN32_LIBS@ @LTLIBINTL@ @EFL_PTHREAD_LIBS@ @rt_libs@ -lm
 libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c
index 72c735ccd6..bf024825aa 100644
--- a/legacy/ecore/src/lib/ecore/ecore.c
+++ b/legacy/ecore/src/lib/ecore/ecore.c
@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#ifndef _MSC_VER
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
 
diff --git a/legacy/ecore/src/lib/ecore/ecore_anim.c b/legacy/ecore/src/lib/ecore/ecore_anim.c
index ac798f4120..cee42fa04e 100644
--- a/legacy/ecore/src/lib/ecore/ecore_anim.c
+++ b/legacy/ecore/src/lib/ecore/ecore_anim.c
@@ -5,11 +5,11 @@
 #include <stdlib.h>
 #include <math.h>
 
+#include <Eo.h>
+
 #include "Ecore.h"
 #include "ecore_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS ECORE_ANIMATOR_CLASS
 
 #define MY_CLASS_NAME "ecore_animator"
diff --git a/legacy/ecore/src/lib/ecore/ecore_app.c b/legacy/ecore/src/lib/ecore/ecore_app.c
index 6e73da0048..04df487d3c 100644
--- a/legacy/ecore/src/lib/ecore/ecore_app.c
+++ b/legacy/ecore/src/lib/ecore/ecore_app.c
@@ -4,9 +4,11 @@
 
 #include <stdlib.h>
 
-#ifndef _MSC_VER
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
-#else
+#endif
+
+#ifdef _MSC_VER
 # include <process.h>
 #endif
 
diff --git a/legacy/ecore/src/lib/ecore/ecore_getopt.c b/legacy/ecore/src/lib/ecore/ecore_getopt.c
index 64f5f9c7d5..377d310f53 100644
--- a/legacy/ecore/src/lib/ecore/ecore_getopt.c
+++ b/legacy/ecore/src/lib/ecore/ecore_getopt.c
@@ -2,21 +2,30 @@
 # include <config.h>
 #endif
 
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#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
+#elif !defined alloca
+# ifdef __GNUC__
+#  define alloca __builtin_alloca
+# elif defined _AIX
+#  define alloca __alloca
+# elif defined _MSC_VER
+#  include <malloc.h>
+#  define alloca _alloca
+# elif !defined HAVE_ALLOCA
+#  ifdef  __cplusplus
 extern "C"
+#  endif
+void *alloca (size_t);
 # endif
-void *alloca(size_t);
 #endif
 
 #include <stdlib.h>
diff --git a/legacy/ecore/src/lib/ecore/ecore_glib.c b/legacy/ecore/src/lib/ecore/ecore_glib.c
index 363b4d0a5d..10cb4a47d8 100644
--- a/legacy/ecore/src/lib/ecore/ecore_glib.c
+++ b/legacy/ecore/src/lib/ecore/ecore_glib.c
@@ -9,7 +9,7 @@
 #include "ecore_private.h"
 
 #ifdef HAVE_GLIB
-#include <glib.h>
+# include <glib.h>
 
 static Eina_Bool _ecore_glib_active = EINA_FALSE;
 static Ecore_Select_Function _ecore_glib_select_original;
diff --git a/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c b/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c
index 59157c2982..e7d10e555a 100644
--- a/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c
+++ b/legacy/ecore/src/lib/ecore/ecore_idle_enterer.c
@@ -4,11 +4,11 @@
 
 #include <stdlib.h>
 
+#include <Eo.h>
+
 #include "Ecore.h"
 #include "ecore_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS ECORE_IDLE_ENTERER_CLASS
 
 #define MY_CLASS_NAME "ecore_idle_enterer"
diff --git a/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c b/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c
index 847ba8879e..8fd20e7a0a 100644
--- a/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c
+++ b/legacy/ecore/src/lib/ecore/ecore_idle_exiter.c
@@ -4,11 +4,11 @@
 
 #include <stdlib.h>
 
+#include <Eo.h>
+
 #include "Ecore.h"
 #include "ecore_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS ECORE_IDLE_EXITER_CLASS
 
 #define MY_CLASS_NAME "ecore_idle_exiter"
diff --git a/legacy/ecore/src/lib/ecore/ecore_idler.c b/legacy/ecore/src/lib/ecore/ecore_idler.c
index e47b210bb1..147b3c1880 100644
--- a/legacy/ecore/src/lib/ecore/ecore_idler.c
+++ b/legacy/ecore/src/lib/ecore/ecore_idler.c
@@ -4,11 +4,11 @@
 
 #include <stdlib.h>
 
+#include <Eo.h>
+
 #include "Ecore.h"
 #include "ecore_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS ECORE_IDLER_CLASS
 
 #define MY_CLASS_NAME "ecore_idler"
diff --git a/legacy/ecore/src/lib/ecore/ecore_job.c b/legacy/ecore/src/lib/ecore/ecore_job.c
index 3b45f0d554..af29d0523d 100644
--- a/legacy/ecore/src/lib/ecore/ecore_job.c
+++ b/legacy/ecore/src/lib/ecore/ecore_job.c
@@ -2,10 +2,10 @@
 # include <config.h>
 #endif
 
-#include <Eo.h>
-
 #include <stdlib.h>
 
+#include <Eo.h>
+
 #include "Ecore.h"
 #include "ecore_private.h"
 
diff --git a/legacy/ecore/src/lib/ecore/ecore_main.c b/legacy/ecore/src/lib/ecore/ecore_main.c
index 96deb45773..22e676dcc3 100644
--- a/legacy/ecore/src/lib/ecore/ecore_main.c
+++ b/legacy/ecore/src/lib/ecore/ecore_main.c
@@ -23,10 +23,15 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#ifndef _MSC_VER
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
-#else
+#endif
+
+#ifdef _MSC_VER
 # include <float.h>
 #endif
 
@@ -113,15 +118,15 @@ epoll_ctl(int                 epfd __UNUSED__,
 #endif
 
 #ifdef HAVE_SYS_TIMERFD_H
-#include <sys/timerfd.h>
+# include <sys/timerfd.h>
 #else
 /* fallback code if we don't have real timerfd - reduces number of ifdefs  */
-#ifndef CLOCK_MONOTONIC
-#define CLOCK_MONOTONIC 0 /* bogus value */
-#endif
-#ifndef TFD_NONBLOCK
-#define TFD_NONBLOCK    0 /* bogus value */
-#endif
+# ifndef CLOCK_MONOTONIC
+#  define CLOCK_MONOTONIC 0 /* bogus value */
+# endif
+# ifndef TFD_NONBLOCK
+#  define TFD_NONBLOCK    0 /* bogus value */
+# endif
 static inline int
 timerfd_create(int clockid __UNUSED__,
                int flags __UNUSED__)
diff --git a/legacy/ecore/src/lib/ecore/ecore_pipe.c b/legacy/ecore/src/lib/ecore/ecore_pipe.c
index 54477dfb4c..5da0923f72 100644
--- a/legacy/ecore/src/lib/ecore/ecore_pipe.c
+++ b/legacy/ecore/src/lib/ecore/ecore_pipe.c
@@ -40,12 +40,6 @@
 # include <Exotic.h>
 #endif
 
-#include "Ecore.h"
-#include "ecore_private.h"
-
-/* How of then we should retry to write to the pipe */
-#define ECORE_PIPE_WRITE_RETRY 6
-
 /*
  * On Windows, pipe() is implemented with sockets.
  * Contrary to Linux, Windows uses different functions
@@ -78,9 +72,12 @@
 
 #endif /* ! _WIN32 */
 
-#include <Ecore.h>
+#include "Ecore.h"
 #include "ecore_private.h"
 
+/* How of then we should retry to write to the pipe */
+#define ECORE_PIPE_WRITE_RETRY 6
+
 struct _Ecore_Pipe
 {
                      ECORE_MAGIC;
diff --git a/legacy/ecore/src/lib/ecore/ecore_poll.c b/legacy/ecore/src/lib/ecore/ecore_poll.c
index a551e769b8..ff1879b57b 100644
--- a/legacy/ecore/src/lib/ecore/ecore_poll.c
+++ b/legacy/ecore/src/lib/ecore/ecore_poll.c
@@ -4,11 +4,11 @@
 
 #include <stdlib.h>
 
+#include <Eo.h>
+
 #include "Ecore.h"
 #include "ecore_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS ECORE_POLLER_CLASS
 
 #define MY_CLASS_NAME "ecore_poller"
diff --git a/legacy/ecore/src/lib/ecore/ecore_thread.c b/legacy/ecore/src/lib/ecore/ecore_thread.c
index 359ac72190..317e1bfc70 100644
--- a/legacy/ecore/src/lib/ecore/ecore_thread.c
+++ b/legacy/ecore/src/lib/ecore/ecore_thread.c
@@ -1,4 +1,3 @@
-
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
@@ -7,7 +6,10 @@
 #include <sys/time.h>
 #include <assert.h>
 #include <sys/types.h>
-#include <unistd.h>
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #ifdef HAVE_EVIL
 # include <Evil.h>
diff --git a/legacy/ecore/src/lib/ecore/ecore_throttle.c b/legacy/ecore/src/lib/ecore/ecore_throttle.c
index de0a43ed9a..febaeacb77 100644
--- a/legacy/ecore/src/lib/ecore/ecore_throttle.c
+++ b/legacy/ecore/src/lib/ecore/ecore_throttle.c
@@ -3,7 +3,10 @@
 #endif
 
 #include <stdlib.h>
-#include <unistd.h>
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
 
 #include "Ecore.h"
 #include "ecore_private.h"
diff --git a/legacy/ecore/src/lib/ecore/ecore_time.c b/legacy/ecore/src/lib/ecore/ecore_time.c
index 0eeb1d64aa..44b1dab81f 100644
--- a/legacy/ecore/src/lib/ecore/ecore_time.c
+++ b/legacy/ecore/src/lib/ecore/ecore_time.c
@@ -16,11 +16,11 @@
 # include <mach/mach_time.h>
 #endif
 
+#include <time.h>
+
 #include "Ecore.h"
 #include "ecore_private.h"
 
-#include <time.h>
-
 #if defined (HAVE_CLOCK_GETTIME) || defined (EXOTIC_PROVIDE_CLOCK_GETTIME)
 static clockid_t _ecore_time_clock_id = -1;
 #elif defined(__APPLE__) && defined(__MACH__)
diff --git a/legacy/ecore/src/lib/ecore/ecore_timer.c b/legacy/ecore/src/lib/ecore/ecore_timer.c
index e4e9577cdd..768198876b 100644
--- a/legacy/ecore/src/lib/ecore/ecore_timer.c
+++ b/legacy/ecore/src/lib/ecore/ecore_timer.c
@@ -5,11 +5,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include <Eo.h>
+
 #include "Ecore.h"
 #include "ecore_private.h"
 
-#include "Eo.h"
-
 #define MY_CLASS ECORE_TIMER_CLASS
 #define MY_CLASS_NAME "ecore_timer"