diff --git a/legacy/ecore/examples/args_example.c b/legacy/ecore/examples/args_example.c
index 439b09c0b6..d8a8a5e84b 100644
--- a/legacy/ecore/examples/args_example.c
+++ b/legacy/ecore/examples/args_example.c
@@ -1,6 +1,9 @@
 /* Example of how to set and retrieve program arguments.
  */
 #include <Ecore.h>
+
+#include <stdlib.h>
+#include <stdio.h>
  
 int timer_once(void *data)
 {
diff --git a/legacy/ecore/examples/event_handler_example.c b/legacy/ecore/examples/event_handler_example.c
index 6e0f1f7e3a..09bc3e7697 100644
--- a/legacy/ecore/examples/event_handler_example.c
+++ b/legacy/ecore/examples/event_handler_example.c
@@ -1,5 +1,8 @@
 /* Ecore Event Handler Example. */
 #include <Ecore.h>
+
+#include <stdlib.h>
+#include <stdio.h>
  
 Ecore_Event_Handler *handler1 = NULL, *handler2 = NULL;
  
diff --git a/legacy/ecore/examples/timer_example.c b/legacy/ecore/examples/timer_example.c
index d04dba22e5..d50d13095c 100644
--- a/legacy/ecore/examples/timer_example.c
+++ b/legacy/ecore/examples/timer_example.c
@@ -2,6 +2,9 @@
  */
 
 #include <Ecore.h>
+
+#include <stdlib.h>
+#include <stdio.h>
  
 Ecore_Timer *timer1 = NULL;
 Ecore_Timer *timer2 = NULL;
diff --git a/legacy/ecore/src/bin/ecore_config.c b/legacy/ecore/src/bin/ecore_config.c
index 690d9fdd22..8474d4098e 100644
--- a/legacy/ecore/src/bin/ecore_config.c
+++ b/legacy/ecore/src/bin/ecore_config.c
@@ -1,6 +1,10 @@
 #include "config.h"
 #include "Ecore.h"
 
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
 #ifdef BUILD_ECORE_CONFIG
 #include "Ecore_Config.h"
 
diff --git a/legacy/ecore/src/bin/ecore_evas_test.h b/legacy/ecore/src/bin/ecore_evas_test.h
index f0b996278d..1b8c845160 100644
--- a/legacy/ecore/src/bin/ecore_evas_test.h
+++ b/legacy/ecore/src/bin/ecore_evas_test.h
@@ -4,6 +4,9 @@
 #include "config.h"
 #include "Ecore.h"
 #include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 
 #ifdef BUILD_ECORE_EVAS
 #include "Ecore_Evas.h"
diff --git a/legacy/ecore/src/bin/ecore_test.c b/legacy/ecore/src/bin/ecore_test.c
index c32aef8c11..0bbad252da 100644
--- a/legacy/ecore/src/bin/ecore_test.c
+++ b/legacy/ecore/src/bin/ecore_test.c
@@ -20,6 +20,11 @@
 #endif
 
 #include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 /* APP GLOBALS */
 double start_time = 0;
diff --git a/legacy/ecore/src/lib/ecore/Ecore.h b/legacy/ecore/src/lib/ecore/Ecore.h
index 308262d677..9c58b13f14 100644
--- a/legacy/ecore/src/lib/ecore/Ecore.h
+++ b/legacy/ecore/src/lib/ecore/Ecore.h
@@ -41,51 +41,12 @@
  */
 
 #include <sys/types.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <limits.h>
 #include <signal.h>
 
-#include <Ecore_Data.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX 4096
-#endif
-
-#ifndef MIN
-#define MIN(x, y) (((x) > (y)) ? (y) : (x))
-#endif
-
-#ifndef MAX
-#define MAX(x, y) (((x) > (y)) ? (x) : (y))
-#endif
-
-#ifndef ABS
-#define ABS(x) ((x) < 0 ? -(x) : (x))
-#endif
-
-#ifndef CLAMP
-#define CLAMP(x, min, max) (((x) > (max)) ? (max) : (((x) < (min)) ? (min) : (x)))
-#endif
-
 #define ECORE_EVENT_NONE         0
 #define ECORE_EVENT_EXE_EXIT     1 /**< Spawned Exe has exit event */
 #define ECORE_EVENT_SIGNAL_USER  2 /**< User signal event */
diff --git a/legacy/ecore/src/lib/ecore/ecore_hash.c b/legacy/ecore/src/lib/ecore/ecore_hash.c
index 0802a2221e..a96c22f0d2 100644
--- a/legacy/ecore/src/lib/ecore/ecore_hash.c
+++ b/legacy/ecore/src/lib/ecore/ecore_hash.c
@@ -1,4 +1,5 @@
-#include <Ecore.h>
+#include "ecore_private.h"
+#include "Ecore_Data.h"
 
 #define ECORE_HASH_CHAIN_MAX 3
 
diff --git a/legacy/ecore/src/lib/ecore/ecore_list.c b/legacy/ecore/src/lib/ecore/ecore_list.c
index deeadab312..9f0deeab1e 100644
--- a/legacy/ecore/src/lib/ecore/ecore_list.c
+++ b/legacy/ecore/src/lib/ecore/ecore_list.c
@@ -1,5 +1,5 @@
 #include "ecore_private.h"
-#include "Ecore.h"
+#include "Ecore_Data.h"
 
 /* Return information about the list */
 static void *_ecore_list_current(Ecore_List * list);
diff --git a/legacy/ecore/src/lib/ecore/ecore_path.c b/legacy/ecore/src/lib/ecore/ecore_path.c
index 9202eea8d0..78b04387b2 100644
--- a/legacy/ecore/src/lib/ecore/ecore_path.c
+++ b/legacy/ecore/src/lib/ecore/ecore_path.c
@@ -1,4 +1,5 @@
-#include <Ecore.h>
+#include "ecore_private.h"
+#include "Ecore_Data.h"
 
 static Ecore_List *group_list = NULL;
 
diff --git a/legacy/ecore/src/lib/ecore/ecore_plugin.c b/legacy/ecore/src/lib/ecore/ecore_plugin.c
index 42d62035d2..37442c0208 100644
--- a/legacy/ecore/src/lib/ecore/ecore_plugin.c
+++ b/legacy/ecore/src/lib/ecore/ecore_plugin.c
@@ -1,4 +1,5 @@
-#include <Ecore.h>
+#include "ecore_private.h"
+#include "Ecore_Data.h"
 
 #ifndef WIN32
 #include <dlfcn.h>
diff --git a/legacy/ecore/src/lib/ecore/ecore_private.h b/legacy/ecore/src/lib/ecore/ecore_private.h
index ef308dc5b7..7228cc8367 100644
--- a/legacy/ecore/src/lib/ecore/ecore_private.h
+++ b/legacy/ecore/src/lib/ecore/ecore_private.h
@@ -3,12 +3,15 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <limits.h>
+#include <dirent.h>
 
 #ifndef WIN32
 #include <sys/mman.h>
@@ -24,6 +27,34 @@
 #define __UNUSED__
 #endif
 
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
+#ifndef MIN
+#define MIN(x, y) (((x) > (y)) ? (y) : (x))
+#endif
+
+#ifndef MAX
+#define MAX(x, y) (((x) > (y)) ? (x) : (y))
+#endif
+
+#ifndef ABS
+#define ABS(x) ((x) < 0 ? -(x) : (x))
+#endif
+
+#ifndef CLAMP
+#define CLAMP(x, min, max) (((x) > (max)) ? (max) : (((x) < (min)) ? (min) : (x)))
+#endif
+
 #define ECORE_MAGIC_NONE            0x1234fedc
 #define ECORE_MAGIC_EXE             0xf7e812f5
 #define ECORE_MAGIC_TIMER           0xf7d713f4
diff --git a/legacy/ecore/src/lib/ecore/ecore_sheap.c b/legacy/ecore/src/lib/ecore/ecore_sheap.c
index b63060881b..969845d7b1 100644
--- a/legacy/ecore/src/lib/ecore/ecore_sheap.c
+++ b/legacy/ecore/src/lib/ecore/ecore_sheap.c
@@ -1,4 +1,5 @@
-#include <Ecore.h>
+#include "ecore_private.h"
+#include "Ecore_Data.h"
 
 static void _ecore_sheap_heapify(Ecore_Sheap *heap, int i);
 static void _ecore_sheap_update_data(Ecore_Sheap *heap);
diff --git a/legacy/ecore/src/lib/ecore/ecore_strings.c b/legacy/ecore/src/lib/ecore/ecore_strings.c
index 032d2a5d81..f1eddffea7 100644
--- a/legacy/ecore/src/lib/ecore/ecore_strings.c
+++ b/legacy/ecore/src/lib/ecore/ecore_strings.c
@@ -1,4 +1,5 @@
-#include <Ecore.h>
+#include "ecore_private.h"
+#include "Ecore_Data.h"
 
 static Ecore_Hash *ecore_strings = NULL;
 
diff --git a/legacy/ecore/src/lib/ecore/ecore_tree.c b/legacy/ecore/src/lib/ecore/ecore_tree.c
index 55322dd675..ed7e146383 100644
--- a/legacy/ecore/src/lib/ecore/ecore_tree.c
+++ b/legacy/ecore/src/lib/ecore/ecore_tree.c
@@ -1,4 +1,5 @@
-#include <Ecore.h>
+#include "ecore_private.h"
+#include "Ecore_Data.h"
 
 /* A macro for determining the highest node at given branch */
 #define MAX_HEIGHT(node) (node ? MAX(node->max_left, node->max_right) : 0)
diff --git a/legacy/ecore/src/lib/ecore/ecore_value.c b/legacy/ecore/src/lib/ecore/ecore_value.c
index d893809b45..34a6d37912 100644
--- a/legacy/ecore/src/lib/ecore/ecore_value.c
+++ b/legacy/ecore/src/lib/ecore/ecore_value.c
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 */
 
-#include <Ecore.h>
+#include "ecore_private.h"
 
 const unsigned int ecore_prime_table[] = { 17, 31, 61, 127, 257, 509, 1021,
 	2053, 4093, 8191, 16381, 32771, 65537, 131071, 262147, 524287, 1048573,
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_private.h b/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
index 6081a01eb2..cc49ee7987 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con_private.h
@@ -1,6 +1,8 @@
 #ifndef _ECORE_CON_PRIVATE_H
 #define _ECORE_CON_PRIVATE_H
 
+#include "Ecore_Data.h"
+
 #define ECORE_MAGIC_CON_SERVER             0x77665544
 #define ECORE_MAGIC_CON_CLIENT             0x77556677
 
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
index 8bd6f92d51..decfd5ff93 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
@@ -4,6 +4,8 @@
 #ifndef _ECORE_EVAS_PRIVATE_H
 #define _ECORE_EVAS_PRIVATE_H
 
+#include "Ecore_Data.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
index 0e4d6eae34..6269b06461 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
+++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
@@ -1,6 +1,8 @@
 #ifndef _ECORE_IPC_PRIVATE_H
 #define _ECORE_IPC_PRIVATE_H
 
+#include "Ecore_Data.h"
+
 #if USE_OPENSSL
 #include <openssl/ssl.h>
 #endif
diff --git a/legacy/ecore/src/lib/ecore_x/ecore_x_private.h b/legacy/ecore/src/lib/ecore_x/ecore_x_private.h
index 89e398e112..11ec16c35a 100644
--- a/legacy/ecore/src/lib/ecore_x/ecore_x_private.h
+++ b/legacy/ecore/src/lib/ecore_x/ecore_x_private.h
@@ -31,6 +31,7 @@
 #include <X11/extensions/Xrandr.h>
 #endif
 
+#include "ecore_private.h"
 #include "Ecore_X.h"
 
 /* FIXME: this is for simulation only */