evas: Keep sane name for public header

Evas_Common.h should be used for the public header, and rather rename
evas_common.h internal header to another name.

Sa:
Evas_Common_Header.h -> Evas_Common.h
evas_common.h -> evas_common_private.h

Shouldn't have both Evas_Common.h and evas_common.h because of case
insensitive filesystems.

161 files changed, 162 insertions, 162 deletions

diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index cbb0cdc9c7..7cc9433e06 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -7,7 +7,7 @@ noinst_LTLIBRARIES =
 installed_evasmainheadersdir = $(includedir)/evas-@VMAJ@
 dist_installed_evasmainheaders_DATA = \
 lib/evas/Evas.h \
-lib/evas/Evas_Common_Header.h \
+lib/evas/Evas_Common.h \
 lib/evas/Evas_Eo.h \
 lib/evas/Evas_Legacy.h \
 lib/evas/Evas_GL.h \
@@ -19,7 +19,7 @@ lib/evas/include/evas_private.h \
 lib/evas/include/evas_options.h \
 lib/evas/include/evas_macros.h \
 lib/evas/include/evas_mmx.h \
-lib/evas/include/evas_common.h \
+lib/evas/include/evas_common_private.h \
 lib/evas/include/evas_blend_ops.h
 
 # Linebreak
diff --git a/src/bin/evas/evas_cserve2.h b/src/bin/evas/evas_cserve2.h
index 5b4c408438..f357c62499 100644
--- a/src/bin/evas/evas_cserve2.h
+++ b/src/bin/evas/evas_cserve2.h
@@ -205,7 +205,7 @@ struct _Slave_Request_Funcs {
 typedef struct _Slave_Request Slave_Request;
 typedef struct _Slave_Request_Funcs Slave_Request_Funcs;
 
-/* This enum must be kept in sync with lib/evas/include/evas_common.h */
+/* This enum must be kept in sync with lib/evas/include/evas_common_private.h */
 typedef enum {
    FONT_REND_REGULAR = 0,
    FONT_REND_SLANT   = (1 << 0),
diff --git a/src/bin/evas/evas_cserve2_scale.c b/src/bin/evas/evas_cserve2_scale.c
index aa96e0438c..9324432f13 100644
--- a/src/bin/evas/evas_cserve2_scale.c
+++ b/src/bin/evas/evas_cserve2_scale.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 void
diff --git a/src/bin/evas/evas_cserve2_slave.h b/src/bin/evas/evas_cserve2_slave.h
index a491b45d8b..de846e9442 100644
--- a/src/bin/evas/evas_cserve2_slave.h
+++ b/src/bin/evas/evas_cserve2_slave.h
@@ -3,7 +3,7 @@
 
 #include <Evas.h>
 
-/* begin bunch of stuff from evas_common.h so that we don't need to drag
+/* begin bunch of stuff from evas_common_private.h so that we don't need to drag
  * a lot of useless @SOMETHING_CFLAGS@ around */
 typedef unsigned long long		DATA64;
 typedef unsigned int			DATA32;
@@ -43,7 +43,7 @@ typedef unsigned char                   DATA8;
 
 #define ARGB_JOIN(a,r,g,b) \
         (((a) << 24) + ((r) << 16) + ((g) << 8) + (b))
-/* end bunchf of stuff from evas_common.h */
+/* end bunchf of stuff from evas_common_private.h */
 
 typedef struct _Evas_Loader_Module_Api Evas_Loader_Module_Api;
 typedef struct _Evas_Img_Load_Params Evas_Img_Load_Params;
diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h
index 585ce48cb7..b20576d2fb 100644
--- a/src/lib/evas/Evas.h
+++ b/src/lib/evas/Evas.h
@@ -283,7 +283,7 @@
 extern "C" {
 #endif
 
-#include <Evas_Common_Header.h>
+#include <Evas_Common.h>
 #ifndef EFL_NOLEGACY_API_SUPPORT
 #include <Evas_Legacy.h>
 #endif
diff --git a/src/lib/evas/Evas_Common_Header.h b/src/lib/evas/Evas_Common.h
index 7849548b4a..7849548b4a 100644
--- a/src/lib/evas/Evas_Common_Header.h
+++ b/src/lib/evas/Evas_Common.h
diff --git a/src/lib/evas/cache/evas_cache_engine_image.c b/src/lib/evas/cache/evas_cache_engine_image.c
index c0c4a6e6db..ffe2d595c5 100644
--- a/src/lib/evas/cache/evas_cache_engine_image.c
+++ b/src/lib/evas/cache/evas_cache_engine_image.c
@@ -4,7 +4,7 @@
 
 #include <assert.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 static void
diff --git a/src/lib/evas/cache/evas_cache_image.c b/src/lib/evas/cache/evas_cache_image.c
index fdc20c6394..fe779a57f1 100644
--- a/src/lib/evas/cache/evas_cache_image.c
+++ b/src/lib/evas/cache/evas_cache_image.c
@@ -12,7 +12,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 //#define CACHEDUMP 1
diff --git a/src/lib/evas/cache/evas_preload.c b/src/lib/evas/cache/evas_preload.c
index f3121a9e32..775871ea20 100644
--- a/src/lib/evas/cache/evas_preload.c
+++ b/src/lib/evas/cache/evas_preload.c
@@ -7,7 +7,7 @@
 #ifdef __linux__
 # include <sys/syscall.h>
 #endif
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "Evas.h"
 
diff --git a/src/lib/evas/cache2/evas_cache2.c b/src/lib/evas/cache2/evas_cache2.c
index e84b41deb2..1e9b24fefb 100644
--- a/src/lib/evas/cache2/evas_cache2.c
+++ b/src/lib/evas/cache2/evas_cache2.c
@@ -12,7 +12,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_cache2.h"
 #include "evas_cs2.h"
diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c
index 0246138f34..f608caa796 100644
--- a/src/lib/evas/canvas/common_interfaces.c
+++ b/src/lib/evas/canvas/common_interfaces.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include "Eo.h"
diff --git a/src/lib/evas/canvas/evas_async_events.c b/src/lib/evas/canvas/evas_async_events.c
index 76d38cb6a4..dd3c593a51 100644
--- a/src/lib/evas/canvas/evas_async_events.c
+++ b/src/lib/evas/canvas/evas_async_events.c
@@ -8,7 +8,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 typedef struct _Evas_Event_Async	Evas_Event_Async;
diff --git a/src/lib/evas/canvas/evas_callbacks.c b/src/lib/evas/canvas/evas_callbacks.c
index b85cc39b32..8dbdfe8cbe 100644
--- a/src/lib/evas/canvas/evas_callbacks.c
+++ b/src/lib/evas/canvas/evas_callbacks.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 int _evas_event_counter = 0;
diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c
index 1d98dc9bfd..0d3999e3fb 100644
--- a/src/lib/evas/canvas/evas_clip.c
+++ b/src/lib/evas/canvas/evas_clip.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 void
diff --git a/src/lib/evas/canvas/evas_common_interface.c b/src/lib/evas/canvas/evas_common_interface.c
index 8f16d5ae73..258fba04a6 100644
--- a/src/lib/evas/canvas/evas_common_interface.c
+++ b/src/lib/evas/canvas/evas_common_interface.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include "Eo.h"
diff --git a/src/lib/evas/canvas/evas_data.c b/src/lib/evas/canvas/evas_data.c
index 1d1d69829d..01355b3ce1 100644
--- a/src/lib/evas/canvas/evas_data.c
+++ b/src/lib/evas/canvas/evas_data.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index 091c23a869..a896bb7ddc 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 EAPI Evas_Device *
diff --git a/src/lib/evas/canvas/evas_events.c b/src/lib/evas/canvas/evas_events.c
index 02c37144cd..93e892f779 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 static Eina_List *
diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c
index 38c6af0fc1..ab75ae1a5a 100644
--- a/src/lib/evas/canvas/evas_focus.c
+++ b/src/lib/evas/canvas/evas_focus.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 /* private calls */
diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c
index cf68563d6d..5eea30881e 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -12,7 +12,7 @@
 #include <fontconfig/fontconfig.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 /* font dir cache */
diff --git a/src/lib/evas/canvas/evas_gl.c b/src/lib/evas/canvas/evas_gl.c
index 14a4dd6130..bfad83cfcb 100644
--- a/src/lib/evas/canvas/evas_gl.c
+++ b/src/lib/evas/canvas/evas_gl.c
@@ -1,5 +1,5 @@
 /* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "Evas_GL.h"
 
diff --git a/src/lib/evas/canvas/evas_key.c b/src/lib/evas/canvas/evas_key.c
index aef0fc4dae..e48bbfe007 100644
--- a/src/lib/evas/canvas/evas_key.c
+++ b/src/lib/evas/canvas/evas_key.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 /* private calls */
diff --git a/src/lib/evas/canvas/evas_key_grab.c b/src/lib/evas/canvas/evas_key_grab.c
index 202c9bf615..19b6594dc6 100644
--- a/src/lib/evas/canvas/evas_key_grab.c
+++ b/src/lib/evas/canvas/evas_key_grab.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 /* private calls */
diff --git a/src/lib/evas/canvas/evas_layer.c b/src/lib/evas/canvas/evas_layer.c
index b30ba66b2b..2484d6c029 100644
--- a/src/lib/evas/canvas/evas_layer.c
+++ b/src/lib/evas/canvas/evas_layer.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 static void _evas_layer_free(Evas_Layer *lay);
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 79687ee8eb..e4df1f8d80 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 //#include "evas_cs.h"
 #ifdef EVAS_CSERVE2
diff --git a/src/lib/evas/canvas/evas_map.c b/src/lib/evas/canvas/evas_map.c
index 66843da18e..2a6873af35 100644
--- a/src/lib/evas/canvas/evas_map.c
+++ b/src/lib/evas/canvas/evas_map.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include <math.h>
 
diff --git a/src/lib/evas/canvas/evas_name.c b/src/lib/evas/canvas/evas_name.c
index 9693f0c907..454fb89066 100644
--- a/src/lib/evas/canvas/evas_name.c
+++ b/src/lib/evas/canvas/evas_name.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 EAPI void
diff --git a/src/lib/evas/canvas/evas_object_box.c b/src/lib/evas/canvas/evas_object_box.c
index 7b5c654c5a..84200edf3c 100644
--- a/src/lib/evas/canvas/evas_object_box.c
+++ b/src/lib/evas/canvas/evas_object_box.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #ifdef _WIN32_WCE
diff --git a/src/lib/evas/canvas/evas_object_grid.c b/src/lib/evas/canvas/evas_object_grid.c
index f2a5779b27..c0bbc96a83 100644
--- a/src/lib/evas/canvas/evas_object_grid.c
+++ b/src/lib/evas/canvas/evas_object_grid.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include <errno.h>
 
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index bced46c22d..e89f442968 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -10,7 +10,7 @@
 #endif
 #include <math.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #ifdef EVAS_CSERVE2
 #include "../cserve2/evas_cs2_private.h"
diff --git a/src/lib/evas/canvas/evas_object_inform.c b/src/lib/evas/canvas/evas_object_inform.c
index c48b07f1cc..c4aa8e199c 100644
--- a/src/lib/evas/canvas/evas_object_inform.c
+++ b/src/lib/evas/canvas/evas_object_inform.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 /* local calls */
diff --git a/src/lib/evas/canvas/evas_object_intercept.c b/src/lib/evas/canvas/evas_object_intercept.c
index 41418f1221..7bf695441a 100644
--- a/src/lib/evas/canvas/evas_object_intercept.c
+++ b/src/lib/evas/canvas/evas_object_intercept.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 /* local calls */
diff --git a/src/lib/evas/canvas/evas_object_line.c b/src/lib/evas/canvas/evas_object_line.c
index 10cf3661dc..8c8e1c5003 100644
--- a/src/lib/evas/canvas/evas_object_line.c
+++ b/src/lib/evas/canvas/evas_object_line.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include "Eo.h"
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index f1ba18fa10..c0b3d7e11b 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 EVAS_MEMPOOL(_mp_sh);
diff --git a/src/lib/evas/canvas/evas_object_polygon.c b/src/lib/evas/canvas/evas_object_polygon.c
index ad4f9b290c..28c3e0bb5f 100644
--- a/src/lib/evas/canvas/evas_object_polygon.c
+++ b/src/lib/evas/canvas/evas_object_polygon.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include "Eo.h"
diff --git a/src/lib/evas/canvas/evas_object_rectangle.c b/src/lib/evas/canvas/evas_object_rectangle.c
index 6c35155ae1..27da84733e 100644
--- a/src/lib/evas/canvas/evas_object_rectangle.c
+++ b/src/lib/evas/canvas/evas_object_rectangle.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include "Eo.h"
diff --git a/src/lib/evas/canvas/evas_object_smart.c b/src/lib/evas/canvas/evas_object_smart.c
index cc2e4dd961..e5c2a0cd80 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include "Eo.h"
diff --git a/src/lib/evas/canvas/evas_object_smart_clipped.c b/src/lib/evas/canvas/evas_object_smart_clipped.c
index 1656dc01ad..f247f6d0e0 100644
--- a/src/lib/evas/canvas/evas_object_smart_clipped.c
+++ b/src/lib/evas/canvas/evas_object_smart_clipped.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 EAPI Eo_Op EVAS_OBJ_SMART_CLIPPED_BASE_ID = EO_NOOP;
diff --git a/src/lib/evas/canvas/evas_object_table.c b/src/lib/evas/canvas/evas_object_table.c
index 57e7dc623d..efe3240f95 100644
--- a/src/lib/evas/canvas/evas_object_table.c
+++ b/src/lib/evas/canvas/evas_object_table.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include <errno.h>
 
diff --git a/src/lib/evas/canvas/evas_object_text.c b/src/lib/evas/canvas/evas_object_text.c
index 932603bfb6..c36f6d5ba1 100644
--- a/src/lib/evas/canvas/evas_object_text.c
+++ b/src/lib/evas/canvas/evas_object_text.c
@@ -1,4 +1,4 @@
-#include "evas_common.h" /* Includes evas_bidi_utils stuff. */
+#include "evas_common_private.h" /* Includes evas_bidi_utils stuff. */
 #include "evas_private.h"
 
 #include "Eo.h"
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 7130d31dba..4ac813dff0 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -61,7 +61,7 @@
  * @subsection textblock_layout The layout system
  * @todo write @ref textblock_layout
  */
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include <stdlib.h>
 
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c
index dc6e6e76c5..c5c7a3e1c8 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -1,4 +1,4 @@
-#include "evas_common.h" /* Includes evas_bidi_utils stuff. */
+#include "evas_common_private.h" /* Includes evas_bidi_utils stuff. */
 #include "evas_private.h"
 
 #include "Eo.h"
diff --git a/src/lib/evas/canvas/evas_out.c b/src/lib/evas/canvas/evas_out.c
index 3d22e52e48..592c0385ac 100644
--- a/src/lib/evas/canvas/evas_out.c
+++ b/src/lib/evas/canvas/evas_out.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 //#include "evas_cs.h"
 #ifdef EVAS_CSERVE2
diff --git a/src/lib/evas/canvas/evas_rectangle.c b/src/lib/evas/canvas/evas_rectangle.c
index da6b701625..bfa4a8aab1 100644
--- a/src/lib/evas/canvas/evas_rectangle.c
+++ b/src/lib/evas/canvas/evas_rectangle.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 void
diff --git a/src/lib/evas/canvas/evas_render.c b/src/lib/evas/canvas/evas_render.c
index 044bac6c9b..c6cfebf504 100644
--- a/src/lib/evas/canvas/evas_render.c
+++ b/src/lib/evas/canvas/evas_render.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include <math.h>
 #ifdef EVAS_CSERVE2
diff --git a/src/lib/evas/canvas/evas_smart.c b/src/lib/evas/canvas/evas_smart.c
index 87856b7674..ccd9a69855 100644
--- a/src/lib/evas/canvas/evas_smart.c
+++ b/src/lib/evas/canvas/evas_smart.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 
diff --git a/src/lib/evas/canvas/evas_stack.c b/src/lib/evas/canvas/evas_stack.c
index 1f1f210d06..e8b626b51b 100644
--- a/src/lib/evas/canvas/evas_stack.c
+++ b/src/lib/evas/canvas/evas_stack.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 static Evas_Object_Protected_Data *
diff --git a/src/lib/evas/canvas/evas_stats.c b/src/lib/evas/canvas/evas_stats.c
index ba6f8ac4de..f178fba088 100644
--- a/src/lib/evas/canvas/evas_stats.c
+++ b/src/lib/evas/canvas/evas_stats.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 //#include "evas_cs.h"
 
diff --git a/src/lib/evas/canvas/evas_touch_point.c b/src/lib/evas/canvas/evas_touch_point.c
index 759ac8f908..83da0a147f 100644
--- a/src/lib/evas/canvas/evas_touch_point.c
+++ b/src/lib/evas/canvas/evas_touch_point.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 void
diff --git a/src/lib/evas/common/evas_blend_main.c b/src/lib/evas/common/evas_blend_main.c
index d37d888769..6e08382286 100644
--- a/src/lib/evas/common/evas_blend_main.c
+++ b/src/lib/evas/common/evas_blend_main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_blend_private.h"
 
 #ifdef BUILD_MMX
diff --git a/src/lib/evas/common/evas_blit_main.c b/src/lib/evas/common/evas_blit_main.c
index bed6d01dc0..2daaab9bd0 100644
--- a/src/lib/evas/common/evas_blit_main.c
+++ b/src/lib/evas/common/evas_blit_main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 #ifdef BUILD_MMX
 #include "evas_mmx.h"
diff --git a/src/lib/evas/common/evas_convert_color.c b/src/lib/evas/common/evas_convert_color.c
index 70a9e90418..34bb978d81 100644
--- a/src/lib/evas/common/evas_convert_color.c
+++ b/src/lib/evas/common/evas_convert_color.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_color.h"
 
 
diff --git a/src/lib/evas/common/evas_convert_colorspace.c b/src/lib/evas/common/evas_convert_colorspace.c
index 49b066c1c2..122780499e 100644
--- a/src/lib/evas/common/evas_convert_colorspace.c
+++ b/src/lib/evas/common/evas_convert_colorspace.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_colorspace.h"
 
 #define CONVERT_RGB_565_TO_RGB_888(s) \
diff --git a/src/lib/evas/common/evas_convert_gry_1.c b/src/lib/evas/common/evas_convert_gry_1.c
index df12ea6fa7..d4eca7d64c 100644
--- a/src/lib/evas/common/evas_convert_gry_1.c
+++ b/src/lib/evas/common/evas_convert_gry_1.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_gry_1.h"
 
 void evas_common_convert_rgba_to_1bpp_gry_1_dith(DATA32 *src EINA_UNUSED, DATA8 *dst EINA_UNUSED, int src_jump EINA_UNUSED, int dst_jump EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal EINA_UNUSED)
diff --git a/src/lib/evas/common/evas_convert_gry_8.c b/src/lib/evas/common/evas_convert_gry_8.c
index 072a7dc720..30993ce498 100644
--- a/src/lib/evas/common/evas_convert_gry_8.c
+++ b/src/lib/evas/common/evas_convert_gry_8.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_gry_8.h"
 
 #ifdef USE_DITHER_44
diff --git a/src/lib/evas/common/evas_convert_grypal_6.c b/src/lib/evas/common/evas_convert_grypal_6.c
index 243bf000e6..920fcfdf26 100644
--- a/src/lib/evas/common/evas_convert_grypal_6.c
+++ b/src/lib/evas/common/evas_convert_grypal_6.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_grypal_6.h"
 
 void evas_common_convert_rgba_to_8bpp_pal_gray64(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x EINA_UNUSED, int dith_y EINA_UNUSED, DATA8 *pal)
diff --git a/src/lib/evas/common/evas_convert_main.c b/src/lib/evas/common/evas_convert_main.c
index 55a2851881..ac028b8cbe 100644
--- a/src/lib/evas/common/evas_convert_main.c
+++ b/src/lib/evas/common/evas_convert_main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_rgb_8.h"
 #include "evas_convert_rgb_16.h"
 #include "evas_convert_rgb_24.h"
diff --git a/src/lib/evas/common/evas_convert_rgb_16.c b/src/lib/evas/common/evas_convert_rgb_16.c
index d7a4f492f0..dcf49ee799 100644
--- a/src/lib/evas/common/evas_convert_rgb_16.c
+++ b/src/lib/evas/common/evas_convert_rgb_16.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_rgb_16.h"
 
 #ifndef BUILD_NO_DITHER_MASK
diff --git a/src/lib/evas/common/evas_convert_rgb_24.c b/src/lib/evas/common/evas_convert_rgb_24.c
index c1d196e549..d02f835970 100644
--- a/src/lib/evas/common/evas_convert_rgb_24.c
+++ b/src/lib/evas/common/evas_convert_rgb_24.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_rgb_24.h"
 
 void
diff --git a/src/lib/evas/common/evas_convert_rgb_32.c b/src/lib/evas/common/evas_convert_rgb_32.c
index b7652269c0..11c47e26b0 100644
--- a/src/lib/evas/common/evas_convert_rgb_32.c
+++ b/src/lib/evas/common/evas_convert_rgb_32.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_rgb_32.h"
 
 void
diff --git a/src/lib/evas/common/evas_convert_rgb_8.c b/src/lib/evas/common/evas_convert_rgb_8.c
index 7ae0e86fd7..2cf178c6f1 100644
--- a/src/lib/evas/common/evas_convert_rgb_8.c
+++ b/src/lib/evas/common/evas_convert_rgb_8.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_rgb_8.h"
 
 #ifdef USE_DITHER_44
diff --git a/src/lib/evas/common/evas_convert_yuv.c b/src/lib/evas/common/evas_convert_yuv.c
index 0b6aa6a000..b7e98e2325 100644
--- a/src/lib/evas/common/evas_convert_yuv.c
+++ b/src/lib/evas/common/evas_convert_yuv.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_yuv.h"
 
 #ifdef BUILD_MMX
diff --git a/src/lib/evas/common/evas_cpu.c b/src/lib/evas/common/evas_cpu.c
index f9cecff531..41390989d8 100644
--- a/src/lib/evas/common/evas_cpu.c
+++ b/src/lib/evas/common/evas_cpu.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #ifdef BUILD_MMX
 #include "evas_mmx.h"
 #endif
diff --git a/src/lib/evas/common/evas_draw_main.c b/src/lib/evas/common/evas_draw_main.c
index bf0f96b2ea..296ffe849b 100644
--- a/src/lib/evas/common/evas_draw_main.c
+++ b/src/lib/evas/common/evas_draw_main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_main.h"
 #include "evas_private.h"
 
diff --git a/src/lib/evas/common/evas_font_draw.c b/src/lib/evas/common/evas_font_draw.c
index 7a182f8f59..184c4779a7 100644
--- a/src/lib/evas/common/evas_font_draw.c
+++ b/src/lib/evas/common/evas_font_draw.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_blend_private.h"
 
diff --git a/src/lib/evas/common/evas_font_load.c b/src/lib/evas/common/evas_font_load.c
index 76e0382f96..2e1ce0ecec 100644
--- a/src/lib/evas/common/evas_font_load.c
+++ b/src/lib/evas/common/evas_font_load.c
@@ -10,7 +10,7 @@
 # include <hb.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include "evas_font_private.h" /* for Frame-Queuing support */
diff --git a/src/lib/evas/common/evas_font_main.c b/src/lib/evas/common/evas_font_main.c
index 80d722144b..23ba95b0fc 100644
--- a/src/lib/evas/common/evas_font_main.c
+++ b/src/lib/evas/common/evas_font_main.c
@@ -4,7 +4,7 @@
 
 #include <assert.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include "evas_font_private.h"
diff --git a/src/lib/evas/common/evas_font_ot.c b/src/lib/evas/common/evas_font_ot.c
index 002437651e..31383a4ebf 100644
--- a/src/lib/evas/common/evas_font_ot.c
+++ b/src/lib/evas/common/evas_font_ot.c
@@ -5,7 +5,7 @@
 # include <hb-ft.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 #include <Eina.h>
 #include "evas_font_private.h"
diff --git a/src/lib/evas/common/evas_font_query.c b/src/lib/evas/common/evas_font_query.c
index c2f68de922..b2a63c0191 100644
--- a/src/lib/evas/common/evas_font_query.c
+++ b/src/lib/evas/common/evas_font_query.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "language/evas_bidi_utils.h" /*defines BIDI_SUPPORT if possible */
 #include "evas_font_private.h" /* for Frame-Queuing support */
 #include "evas_font_ot.h"
diff --git a/src/lib/evas/common/evas_image_data.c b/src/lib/evas/common/evas_image_data.c
index 25cf3d70c6..fe808323e6 100644
--- a/src/lib/evas/common/evas_image_data.c
+++ b/src/lib/evas/common/evas_image_data.c
@@ -4,7 +4,7 @@
 
 #include <assert.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_image.h"
 
diff --git a/src/lib/evas/common/evas_image_load.c b/src/lib/evas/common/evas_image_load.c
index 7d0d6712f6..b832e3fc82 100644
--- a/src/lib/evas/common/evas_image_load.c
+++ b/src/lib/evas/common/evas_image_load.c
@@ -6,7 +6,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 //#include "evas_cs.h"
 #ifdef EVAS_CSERVE2
diff --git a/src/lib/evas/common/evas_image_main.c b/src/lib/evas/common/evas_image_main.c
index 3d9972a64e..5d125784fc 100644
--- a/src/lib/evas/common/evas_image_main.c
+++ b/src/lib/evas/common/evas_image_main.c
@@ -6,7 +6,7 @@
 # include <Eet.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_image_private.h"
 #include "evas_convert_yuv.h"
diff --git a/src/lib/evas/common/evas_image_save.c b/src/lib/evas/common/evas_image_save.c
index ad69a10e53..1de5e6d8a4 100644
--- a/src/lib/evas/common/evas_image_save.c
+++ b/src/lib/evas/common/evas_image_save.c
@@ -4,7 +4,7 @@
 
 #include "evas_options.h"
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 
diff --git a/src/lib/evas/common/evas_image_scalecache.c b/src/lib/evas/common/evas_image_scalecache.c
index 40463a9b72..5d7a440261 100644
--- a/src/lib/evas/common/evas_image_scalecache.c
+++ b/src/lib/evas/common/evas_image_scalecache.c
@@ -11,7 +11,7 @@
 #ifdef EVAS_CSERVE2
 #include "evas_cs2_private.h"
 #endif
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_image_private.h"
 
diff --git a/src/lib/evas/common/evas_line_main.c b/src/lib/evas/common/evas_line_main.c
index 1985b469c0..d3abf1a1bf 100644
--- a/src/lib/evas/common/evas_line_main.c
+++ b/src/lib/evas/common/evas_line_main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_blend_private.h"
 
 #define IN_RANGE(x, y, w, h) \
diff --git a/src/lib/evas/common/evas_map_image.c b/src/lib/evas/common/evas_map_image.c
index a9e713937f..742ab74eae 100644
--- a/src/lib/evas/common/evas_map_image.c
+++ b/src/lib/evas/common/evas_map_image.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_blend_private.h"
 #ifdef EVAS_CSERVE2
diff --git a/src/lib/evas/common/evas_op_add_main_.c b/src/lib/evas/common/evas_op_add_main_.c
index bde553c458..294f1d977b 100644
--- a/src/lib/evas/common/evas_op_add_main_.c
+++ b/src/lib/evas/common/evas_op_add_main_.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 static RGBA_Gfx_Func     op_add_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
 static RGBA_Gfx_Pt_Func  op_add_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
 
diff --git a/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c
index eac6755b97..667838eb8a 100644
--- a/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c
+++ b/src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c
@@ -1,6 +1,6 @@
 #define NEED_SSE3 1
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 #ifdef BUILD_SSE3
 static __m128i A_MASK_SSE3;
diff --git a/src/lib/evas/common/evas_op_blend_main_.c b/src/lib/evas/common/evas_op_blend_main_.c
index fdfb1dcdd8..5c85673463 100644
--- a/src/lib/evas/common/evas_op_blend_main_.c
+++ b/src/lib/evas/common/evas_op_blend_main_.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 RGBA_Gfx_Func     op_blend_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
 RGBA_Gfx_Pt_Func  op_blend_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
diff --git a/src/lib/evas/common/evas_op_copy_main_.c b/src/lib/evas/common/evas_op_copy_main_.c
index 9debe171b2..6e3881de21 100644
--- a/src/lib/evas/common/evas_op_copy_main_.c
+++ b/src/lib/evas/common/evas_op_copy_main_.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_blend_private.h"
 
 static RGBA_Gfx_Func     op_copy_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
diff --git a/src/lib/evas/common/evas_op_mask_main_.c b/src/lib/evas/common/evas_op_mask_main_.c
index 4ed41d6db3..55a5d95c70 100644
--- a/src/lib/evas/common/evas_op_mask_main_.c
+++ b/src/lib/evas/common/evas_op_mask_main_.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 static RGBA_Gfx_Func     op_mask_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
 static RGBA_Gfx_Pt_Func  op_mask_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
diff --git a/src/lib/evas/common/evas_op_mul_main_.c b/src/lib/evas/common/evas_op_mul_main_.c
index 26604d7230..222062e68d 100644
--- a/src/lib/evas/common/evas_op_mul_main_.c
+++ b/src/lib/evas/common/evas_op_mul_main_.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 static RGBA_Gfx_Func     op_mul_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
 static RGBA_Gfx_Pt_Func  op_mul_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
diff --git a/src/lib/evas/common/evas_op_sub_main_.c b/src/lib/evas/common/evas_op_sub_main_.c
index 9301cacf6b..02bfdbde28 100644
--- a/src/lib/evas/common/evas_op_sub_main_.c
+++ b/src/lib/evas/common/evas_op_sub_main_.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 static RGBA_Gfx_Func     op_sub_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
 static RGBA_Gfx_Pt_Func  op_sub_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
diff --git a/src/lib/evas/common/evas_pipe.c b/src/lib/evas/common/evas_pipe.c
index 02f74dc9d0..4c08bc5054 100644
--- a/src/lib/evas/common/evas_pipe.c
+++ b/src/lib/evas/common/evas_pipe.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include <unistd.h>
 
 #ifdef BUILD_PIPE_RENDER
diff --git a/src/lib/evas/common/evas_polygon_main.c b/src/lib/evas/common/evas_polygon_main.c
index 8635d1c16c..52dd180665 100644
--- a/src/lib/evas/common/evas_polygon_main.c
+++ b/src/lib/evas/common/evas_polygon_main.c
@@ -4,7 +4,7 @@
 
 #include <math.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_blend_private.h"
 
 typedef struct _RGBA_Span RGBA_Span;
diff --git a/src/lib/evas/common/evas_rectangle_main.c b/src/lib/evas/common/evas_rectangle_main.c
index 4aa536abe7..c4722426b4 100644
--- a/src/lib/evas/common/evas_rectangle_main.c
+++ b/src/lib/evas/common/evas_rectangle_main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_blend_private.h"
 
diff --git a/src/lib/evas/common/evas_regionbuf.c b/src/lib/evas/common/evas_regionbuf.c
index f381da5cc8..3b14af835c 100644
--- a/src/lib/evas/common/evas_regionbuf.c
+++ b/src/lib/evas/common/evas_regionbuf.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 #if 0
 Regionbuf *
diff --git a/src/lib/evas/common/evas_scale_main.c b/src/lib/evas/common/evas_scale_main.c
index 91662666e4..8de658b619 100644
--- a/src/lib/evas/common/evas_scale_main.c
+++ b/src/lib/evas/common/evas_scale_main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 EAPI void
diff --git a/src/lib/evas/common/evas_scale_sample.c b/src/lib/evas/common/evas_scale_sample.c
index 68106a80e2..6aaa902cdb 100644
--- a/src/lib/evas/common/evas_scale_sample.c
+++ b/src/lib/evas/common/evas_scale_sample.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_blend_private.h"
 
 static Eina_Bool scale_rgba_in_to_out_clip_sample_internal(RGBA_Image *src, RGBA_Image *dst, RGBA_Draw_Context *dc, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h);
diff --git a/src/lib/evas/common/evas_scale_smooth.c b/src/lib/evas/common/evas_scale_smooth.c
index c9c51a7f86..02dbe7d44d 100644
--- a/src/lib/evas/common/evas_scale_smooth.c
+++ b/src/lib/evas/common/evas_scale_smooth.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_scale_smooth.h"
 #include "evas_blend_private.h"
 
diff --git a/src/lib/evas/common/evas_scale_span.c b/src/lib/evas/common/evas_scale_span.c
index 5182a97c36..8e5bf6c0bd 100644
--- a/src/lib/evas/common/evas_scale_span.c
+++ b/src/lib/evas/common/evas_scale_span.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_convert_color.h"
 #include "evas_scale_span.h"
 
diff --git a/src/lib/evas/common/evas_text_utils.c b/src/lib/evas/common/evas_text_utils.c
index bad68b20bb..14d09486b9 100644
--- a/src/lib/evas/common/evas_text_utils.c
+++ b/src/lib/evas/common/evas_text_utils.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_font_private.h"
 #include "evas_text_utils.h"
 #include "language/evas_bidi_utils.h"
diff --git a/src/lib/evas/common/evas_thread_render.c b/src/lib/evas/common/evas_thread_render.c
index 40964ba7ec..f37f43a6f7 100644
--- a/src/lib/evas/common/evas_thread_render.c
+++ b/src/lib/evas/common/evas_thread_render.c
@@ -1,6 +1,6 @@
 #include <assert.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 static Eina_Thread evas_thread_worker;
 static Eina_Condition evas_thread_queue_condition;
diff --git a/src/lib/evas/common/evas_tiler.c b/src/lib/evas/common/evas_tiler.c
index b61e7705e3..6315c3c81f 100644
--- a/src/lib/evas/common/evas_tiler.c
+++ b/src/lib/evas/common/evas_tiler.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #ifdef EVAS_RECT_SPLIT
 
 static inline void rect_list_node_pool_set_max(int max);
diff --git a/src/lib/evas/common/language/evas_bidi_utils.c b/src/lib/evas/common/language/evas_bidi_utils.c
index 324db31105..0707f4ef15 100644
--- a/src/lib/evas/common/language/evas_bidi_utils.c
+++ b/src/lib/evas/common/language/evas_bidi_utils.c
@@ -5,7 +5,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_bidi_utils.h"
 
 #include "evas_font_private.h"
diff --git a/src/lib/evas/cserve2/evas_cs2_private.h b/src/lib/evas/cserve2/evas_cs2_private.h
index cb435717cf..b055d1b90b 100644
--- a/src/lib/evas/cserve2/evas_cs2_private.h
+++ b/src/lib/evas/cserve2/evas_cs2_private.h
@@ -1,7 +1,7 @@
 #ifndef EVAS_CS2_PRIVATE_H
 #define EVAS_CS2_PRIVATE_H 1
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 struct _Data_Entry {
    unsigned int image_id;
diff --git a/src/lib/evas/file/evas_module.c b/src/lib/evas/file/evas_module.c
index 539ef5ec4f..b7490c6dc8 100644
--- a/src/lib/evas/file/evas_module.c
+++ b/src/lib/evas/file/evas_module.c
@@ -4,7 +4,7 @@
 
 #include <string.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 
diff --git a/src/lib/evas/file/evas_path.c b/src/lib/evas/file/evas_path.c
index 2ff646dd64..6d78218dc4 100644
--- a/src/lib/evas/file/evas_path.c
+++ b/src/lib/evas/file/evas_path.c
@@ -22,7 +22,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #ifdef _WIN32
diff --git a/src/lib/evas/include/evas_common.h b/src/lib/evas/include/evas_common_private.h
index 1a3c10c086..1a3c10c086 100644
--- a/src/lib/evas/include/evas_common.h
+++ b/src/lib/evas/include/evas_common_private.h
diff --git a/src/lib/evas/main.c b/src/lib/evas/main.c
index 604c14d996..caf8de1e81 100644
--- a/src/lib/evas/main.c
+++ b/src/lib/evas/main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 static Evas_Version _version = { VMAJ, VMIN, VMIC, VREV };
diff --git a/src/modules/evas/engines/buffer/evas_engine.c b/src/modules/evas/engines/buffer/evas_engine.c
index 72df536168..1680f2cecf 100644
--- a/src/modules/evas/engines/buffer/evas_engine.c
+++ b/src/modules/evas/engines/buffer/evas_engine.c
@@ -1,10 +1,10 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_engine.h"
 #include "Evas_Engine_Buffer.h"
 
 /* domain for eina_log */
-/* the log macros are defined in evas_common.h */
+/* the log macros are defined in evas_common_private.h */
 /* theirs names are EVAS_ERR, EVAS_DBG, EVAS_CRIT, EVAS_WRN and EVAS_INF */
 /* although we can use the EVAS_ERROR, etc... macros it will not work
    when the -fvisibility=hidden option is passed to gcc */
diff --git a/src/modules/evas/engines/buffer/evas_engine.h b/src/modules/evas/engines/buffer/evas_engine.h
index af824776ab..8cdf8f4e53 100644
--- a/src/modules/evas/engines/buffer/evas_engine.h
+++ b/src/modules/evas/engines/buffer/evas_engine.h
@@ -1,6 +1,6 @@
 #ifndef EVAS_ENGINE_H
 #define EVAS_ENGINE_H
-#include "evas_common.h"
+#include "evas_common_private.h"
 /*  this thing is for eina_log */
 extern int _evas_engine_buffer_log_dom ;
 
diff --git a/src/modules/evas/engines/buffer/evas_outbuf.c b/src/modules/evas/engines/buffer/evas_outbuf.c
index 58ce0e6784..af5566fceb 100644
--- a/src/modules/evas/engines/buffer/evas_outbuf.c
+++ b/src/modules/evas/engines/buffer/evas_outbuf.c
@@ -6,7 +6,7 @@
 #include "evas_cs2_private.h"
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_engine.h"
 
 void
diff --git a/src/modules/evas/engines/drm/evas_engine.c b/src/modules/evas/engines/drm/evas_engine.c
index 064b0bd5e6..cc5e86fbd7 100644
--- a/src/modules/evas/engines/drm/evas_engine.c
+++ b/src/modules/evas/engines/drm/evas_engine.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "Evas_Engine_Drm.h"
 #include "evas_engine.h"
diff --git a/src/modules/evas/engines/drm/evas_outbuf.c b/src/modules/evas/engines/drm/evas_outbuf.c
index 420e431046..e6327b6d85 100644
--- a/src/modules/evas/engines/drm/evas_outbuf.c
+++ b/src/modules/evas/engines/drm/evas_outbuf.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_engine.h"
 
diff --git a/src/modules/evas/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c
index 3a1a11be75..ea73f8e5d3 100644
--- a/src/modules/evas/engines/fb/evas_engine.c
+++ b/src/modules/evas/engines/fb/evas_engine.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_engine.h"
 #include "Evas_Engine_FB.h"
diff --git a/src/modules/evas/engines/fb/evas_fb_main.c b/src/modules/evas/engines/fb/evas_fb_main.c
index 5cf2ac488a..451171d97f 100644
--- a/src/modules/evas/engines/fb/evas_fb_main.c
+++ b/src/modules/evas/engines/fb/evas_fb_main.c
@@ -4,7 +4,7 @@
 /* some other system if needed.                                         */
 /* Copyright (c) 1999 - Carsten Haitzler (The Rasterman)                */
 /* -------------------------------------------------------------------- */
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_fb.h"
 
 #include <sys/ioctl.h>
diff --git a/src/modules/evas/engines/fb/evas_outbuf.c b/src/modules/evas/engines/fb/evas_outbuf.c
index 7ae24c5e1e..04985d3b7c 100644
--- a/src/modules/evas/engines/fb/evas_outbuf.c
+++ b/src/modules/evas/engines/fb/evas_outbuf.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_engine.h"
 #include <sys/time.h>
 #include <sys/utsname.h>
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index bdc0b2cd95..83c2968cc3 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -1,4 +1,4 @@
-#include "evas_common.h" /* Also includes international specific stuff */
+#include "evas_common_private.h" /* Also includes international specific stuff */
 #include "evas_engine.h"
 
 #include "evas_private.h"
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h
index 4bc219683c..8dc08ae37f 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -1,7 +1,7 @@
 #ifndef EVAS_GL_COMMON_H
 #define EVAS_GL_COMMON_H
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "config.h"
 
diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.c b/src/modules/evas/engines/gl_sdl/evas_engine.c
index daf1d26850..5c5df60eea 100644
--- a/src/modules/evas/engines/gl_sdl/evas_engine.c
+++ b/src/modules/evas/engines/gl_sdl/evas_engine.c
@@ -1,4 +1,4 @@
-#include "evas_common.h" /* Also includes international specific stuff */
+#include "evas_common_private.h" /* Also includes international specific stuff */
 #include "evas_private.h"
 #include "evas_engine.h"
 
diff --git a/src/modules/evas/engines/gl_sdl/evas_engine.h b/src/modules/evas/engines/gl_sdl/evas_engine.h
index adc03b9357..837b7d9303 100644
--- a/src/modules/evas/engines/gl_sdl/evas_engine.h
+++ b/src/modules/evas/engines/gl_sdl/evas_engine.h
@@ -17,7 +17,7 @@
 # include <SDL/SDL_opengl.h>
 # define EVAS_SDL_GL_FLAG SDL_OPENGL
 #endif
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_gl_common.h"
 #include "Evas.h"
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index f467c29fac..7f408fdd91 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -1,4 +1,4 @@
-#include "evas_common.h" /* Also includes international specific stuff */
+#include "evas_common_private.h" /* Also includes international specific stuff */
 #include "evas_engine.h"
 #include "evas_gl_core_private.h"
 
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.h b/src/modules/evas/engines/gl_x11/evas_engine.h
index aee58b1c21..371a10b39d 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.h
+++ b/src/modules/evas/engines/gl_x11/evas_engine.h
@@ -2,7 +2,7 @@
 #define EVAS_ENGINE_H
 
 #include "config.h"
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_gl_common.h"
 #include "Evas.h"
diff --git a/src/modules/evas/engines/psl1ght/evas_engine.c b/src/modules/evas/engines/psl1ght/evas_engine.c
index 422db09cd7..0f5bcc7665 100644
--- a/src/modules/evas/engines/psl1ght/evas_engine.c
+++ b/src/modules/evas/engines/psl1ght/evas_engine.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_engine.h"
 #include "rsxutil.h"
diff --git a/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c b/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c
index 7ef9211265..3b94686d68 100644
--- a/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c
+++ b/src/modules/evas/engines/software_ddraw/evas_ddraw_buffer.c
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_engine.h"
 
 
diff --git a/src/modules/evas/engines/software_ddraw/evas_ddraw_main.cpp b/src/modules/evas/engines/software_ddraw/evas_ddraw_main.cpp
index 2c467c88ac..a55cebcede 100644
--- a/src/modules/evas/engines/software_ddraw/evas_ddraw_main.cpp
+++ b/src/modules/evas/engines/software_ddraw/evas_ddraw_main.cpp
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_engine.h"
 
 int
diff --git a/src/modules/evas/engines/software_ddraw/evas_engine.c b/src/modules/evas/engines/software_ddraw/evas_engine.c
index a1ab1cd1cb..0520ada8fc 100644
--- a/src/modules/evas/engines/software_ddraw/evas_engine.c
+++ b/src/modules/evas/engines/software_ddraw/evas_engine.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_engine.h"
 #include "Evas_Engine_Software_DDraw.h"
diff --git a/src/modules/evas/engines/software_ddraw/evas_outbuf.c b/src/modules/evas/engines/software_ddraw/evas_outbuf.c
index 5a5f0a289a..8600e0a1d1 100644
--- a/src/modules/evas/engines/software_ddraw/evas_outbuf.c
+++ b/src/modules/evas/engines/software_ddraw/evas_outbuf.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_engine.h"
 
 
diff --git a/src/modules/evas/engines/software_gdi/evas_engine.c b/src/modules/evas/engines/software_gdi/evas_engine.c
index 2f29867f77..9ed5851a93 100644
--- a/src/modules/evas/engines/software_gdi/evas_engine.c
+++ b/src/modules/evas/engines/software_gdi/evas_engine.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "evas_engine.h"
 #include "Evas_Engine_Software_Gdi.h"
diff --git a/src/modules/evas/engines/software_gdi/evas_gdi_buffer.c b/src/modules/evas/engines/software_gdi/evas_gdi_buffer.c
index 66a5abfb2c..fe69d736a0 100644
--- a/src/modules/evas/engines/software_gdi/evas_gdi_buffer.c
+++ b/src/modules/evas/engines/software_gdi/evas_gdi_buffer.c
@@ -1,6 +1,6 @@
 #include <string.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_engine.h"
 
 Gdi_Output_Buffer *
diff --git a/src/modules/evas/engines/software_gdi/evas_gdi_main.c b/src/modules/evas/engines/software_gdi/evas_gdi_main.c
index 2880270438..2ffc0c1270 100644
--- a/src/modules/evas/engines/software_gdi/evas_gdi_main.c
+++ b/src/modules/evas/engines/software_gdi/evas_gdi_main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_engine.h"
 
 
diff --git a/src/modules/evas/engines/software_gdi/evas_outbuf.c b/src/modules/evas/engines/software_gdi/evas_outbuf.c
index 87b3048a79..f406256f9b 100644
--- a/src/modules/evas/engines/software_gdi/evas_outbuf.c
+++ b/src/modules/evas/engines/software_gdi/evas_outbuf.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_engine.h"
 
 
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c b/src/modules/evas/engines/software_generic/evas_engine.c
index 4281112a4f..293536dcba 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -1,4 +1,4 @@
-#include "evas_common.h" /* Also includes international specific stuff */
+#include "evas_common_private.h" /* Also includes international specific stuff */
 #include "evas_private.h"
 #include "evas_blend_private.h"
 #ifdef EVAS_CSERVE2
diff --git a/src/modules/evas/engines/software_x11/evas_engine.c b/src/modules/evas/engines/software_x11/evas_engine.c
index 23e76df372..da21b9bf64 100644
--- a/src/modules/evas/engines/software_x11/evas_engine.c
+++ b/src/modules/evas/engines/software_x11/evas_engine.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include "Evas_Engine_Software_X11.h"
diff --git a/src/modules/evas/engines/software_x11/evas_x_egl.c b/src/modules/evas/engines/software_x11/evas_x_egl.c
index cf783df222..95b4e2419e 100644
--- a/src/modules/evas/engines/software_x11/evas_x_egl.c
+++ b/src/modules/evas/engines/software_x11/evas_x_egl.c
@@ -5,7 +5,7 @@
 #ifdef EVAS_CSERVE2
 #include "evas_cs2_private.h"
 #endif
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_macros.h"
 
 #ifdef HAVE_DLSYM
diff --git a/src/modules/evas/engines/software_x11/evas_xcb_buffer.c b/src/modules/evas/engines/software_x11/evas_xcb_buffer.c
index 9136eb5880..38d4584e50 100644
--- a/src/modules/evas/engines/software_x11/evas_xcb_buffer.c
+++ b/src/modules/evas/engines/software_x11/evas_xcb_buffer.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_xcb_buffer.h"
 
 /* local function prototypes */
diff --git a/src/modules/evas/engines/software_x11/evas_xcb_color.c b/src/modules/evas/engines/software_x11/evas_xcb_color.c
index 2362ac26bc..65c05165ad 100644
--- a/src/modules/evas/engines/software_x11/evas_xcb_color.c
+++ b/src/modules/evas/engines/software_x11/evas_xcb_color.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 #include "evas_engine.h"
 
diff --git a/src/modules/evas/engines/software_x11/evas_xcb_main.c b/src/modules/evas/engines/software_x11/evas_xcb_main.c
index d18701671a..c255e799db 100644
--- a/src/modules/evas/engines/software_x11/evas_xcb_main.c
+++ b/src/modules/evas/engines/software_x11/evas_xcb_main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_engine.h"
 
 void 
diff --git a/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c b/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c
index e8502d6de5..ba544efcb4 100644
--- a/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c
+++ b/src/modules/evas/engines/software_x11/evas_xcb_outbuf.c
@@ -7,7 +7,7 @@
 #ifdef EVAS_CSERVE2
 # include "evas_cs2_private.h"
 #endif
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_macros.h"
 #include "evas_xcb_outbuf.h"
 #include "evas_xcb_buffer.h"
diff --git a/src/modules/evas/engines/software_x11/evas_xcb_xdefaults.c b/src/modules/evas/engines/software_x11/evas_xcb_xdefaults.c
index 3a0bda54dc..de0f599500 100644
--- a/src/modules/evas/engines/software_x11/evas_xcb_xdefaults.c
+++ b/src/modules/evas/engines/software_x11/evas_xcb_xdefaults.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_xcb_xdefaults.h"
 #include <fnmatch.h>
 
diff --git a/src/modules/evas/engines/software_x11/evas_xlib_buffer.c b/src/modules/evas/engines/software_x11/evas_xlib_buffer.c
index bdf308d1a3..9faf9eb7d7 100644
--- a/src/modules/evas/engines/software_x11/evas_xlib_buffer.c
+++ b/src/modules/evas/engines/software_x11/evas_xlib_buffer.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 #include "evas_xlib_buffer.h"
 
diff --git a/src/modules/evas/engines/software_x11/evas_xlib_color.c b/src/modules/evas/engines/software_x11/evas_xlib_color.c
index 806823d8e7..d5592ec2ba 100644
--- a/src/modules/evas/engines/software_x11/evas_xlib_color.c
+++ b/src/modules/evas/engines/software_x11/evas_xlib_color.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 
 #include "evas_engine.h"
 
diff --git a/src/modules/evas/engines/software_x11/evas_xlib_main.c b/src/modules/evas/engines/software_x11/evas_xlib_main.c
index 3c153e1494..dea33dbf32 100644
--- a/src/modules/evas/engines/software_x11/evas_xlib_main.c
+++ b/src/modules/evas/engines/software_x11/evas_xlib_main.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_engine.h"
 
 void
diff --git a/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c
index d495931e5e..a189accc27 100644
--- a/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c
+++ b/src/modules/evas/engines/software_x11/evas_xlib_outbuf.c
@@ -8,7 +8,7 @@
 #ifdef EVAS_CSERVE2
 #include "evas_cs2_private.h"
 #endif
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_macros.h"
 #include "evas_xlib_outbuf.h"
 #include "evas_xlib_buffer.h"
diff --git a/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c b/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c
index df47404a4b..a8cfa53aaa 100644
--- a/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c
+++ b/src/modules/evas/engines/software_x11/evas_xlib_swapbuf.c
@@ -8,7 +8,7 @@
 #ifdef EVAS_CSERVE2
 #include "evas_cs2_private.h"
 #endif
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_macros.h"
 
 #include "evas_xlib_swapbuf.h"
diff --git a/src/modules/evas/engines/software_x11/evas_xlib_swapper.c b/src/modules/evas/engines/software_x11/evas_xlib_swapper.c
index 1e2bd6f075..65ad47836d 100644
--- a/src/modules/evas/engines/software_x11/evas_xlib_swapper.c
+++ b/src/modules/evas/engines/software_x11/evas_xlib_swapper.c
@@ -2,7 +2,7 @@
 # include <config.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_macros.h"
 #include "evas_xlib_swapper.h"
 
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.c b/src/modules/evas/engines/wayland_egl/evas_engine.c
index f8315f783e..7e4d3cdaa6 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.c
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_engine.h"
 #include "evas_gl_core_private.h"
 
diff --git a/src/modules/evas/engines/wayland_egl/evas_engine.h b/src/modules/evas/engines/wayland_egl/evas_engine.h
index ea54090c62..02e1937956 100644
--- a/src/modules/evas/engines/wayland_egl/evas_engine.h
+++ b/src/modules/evas/engines/wayland_egl/evas_engine.h
@@ -13,7 +13,7 @@
 /* #  include <GLES2/gl2ext.h> */
 # endif
 
-# include "evas_common.h"
+# include "evas_common_private.h"
 # include "evas_private.h"
 # include "evas_gl_common.h"
 # include "Evas.h"
diff --git a/src/modules/evas/engines/wayland_shm/evas_engine.c b/src/modules/evas/engines/wayland_shm/evas_engine.c
index 21944249cd..7320086c8a 100644
--- a/src/modules/evas/engines/wayland_shm/evas_engine.c
+++ b/src/modules/evas/engines/wayland_shm/evas_engine.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 #include "Evas_Engine_Wayland_Shm.h"
 #include "evas_engine.h"
diff --git a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c
index 10dcdb7bfa..ccb51ca038 100644
--- a/src/modules/evas/engines/wayland_shm/evas_swapbuf.c
+++ b/src/modules/evas/engines/wayland_shm/evas_swapbuf.c
@@ -8,7 +8,7 @@
 # include "evas_cs2_private.h"
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_macros.h"
 #include "evas_engine.h"
 #include "evas_swapbuf.h"
diff --git a/src/modules/evas/engines/wayland_shm/evas_swapper.c b/src/modules/evas/engines/wayland_shm/evas_swapper.c
index 73764a08aa..74ad08e6a7 100644
--- a/src/modules/evas/engines/wayland_shm/evas_swapper.c
+++ b/src/modules/evas/engines/wayland_shm/evas_swapper.c
@@ -8,7 +8,7 @@
 # include "evas_cs2_private.h"
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_macros.h"
 #include "evas_engine.h"
 #include "evas_swapper.h"
diff --git a/src/modules/evas/loaders/bmp/evas_image_load_bmp.c b/src/modules/evas/loaders/bmp/evas_image_load_bmp.c
index ea86238115..a8e2abf275 100644
--- a/src/modules/evas/loaders/bmp/evas_image_load_bmp.c
+++ b/src/modules/evas/loaders/bmp/evas_image_load_bmp.c
@@ -10,7 +10,7 @@
 
 #include <math.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 typedef struct _BMP_Header BMP_Header;
diff --git a/src/modules/evas/loaders/eet/evas_image_load_eet.c b/src/modules/evas/loaders/eet/evas_image_load_eet.c
index bad82c69a8..6ad0b4a8a5 100644
--- a/src/modules/evas/loaders/eet/evas_image_load_eet.c
+++ b/src/modules/evas/loaders/eet/evas_image_load_eet.c
@@ -4,7 +4,7 @@
 
 #include <Eet.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 typedef struct _Evas_Loader_Internal Evas_Loader_Internal;
diff --git a/src/modules/evas/loaders/generic/evas_image_load_generic.c b/src/modules/evas/loaders/generic/evas_image_load_generic.c
index 0ca7b41ae5..6757d0a8f0 100644
--- a/src/modules/evas/loaders/generic/evas_image_load_generic.c
+++ b/src/modules/evas/loaders/generic/evas_image_load_generic.c
@@ -6,7 +6,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include <stdio.h>
diff --git a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c
index e3de8a5934..edf8137045 100644
--- a/src/modules/evas/loaders/gif/evas_image_load_gif.c
+++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include <sys/types.h>
diff --git a/src/modules/evas/loaders/ico/evas_image_load_ico.c b/src/modules/evas/loaders/ico/evas_image_load_ico.c
index 993b5adcf6..9f96e6961c 100644
--- a/src/modules/evas/loaders/ico/evas_image_load_ico.c
+++ b/src/modules/evas/loaders/ico/evas_image_load_ico.c
@@ -8,7 +8,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 typedef struct _Evas_Loader_Internal Evas_Loader_Internal;
diff --git a/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c b/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
index 4e95bf5843..1cea16b0b8 100644
--- a/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
+++ b/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
@@ -11,7 +11,7 @@
 #include <setjmp.h>
 #include <jpeglib.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 typedef struct _JPEG_error_mgr *emptr;
diff --git a/src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c b/src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c
index 2eb1ecd8f4..b2dca8921e 100644
--- a/src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c
+++ b/src/modules/evas/loaders/pmaps/evas_image_load_pmaps.c
@@ -6,7 +6,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #define FILE_BUFFER_SIZE 1024 * 32
diff --git a/src/modules/evas/loaders/png/evas_image_load_png.c b/src/modules/evas/loaders/png/evas_image_load_png.c
index 08430e0a1b..e670038269 100644
--- a/src/modules/evas/loaders/png/evas_image_load_png.c
+++ b/src/modules/evas/loaders/png/evas_image_load_png.c
@@ -10,7 +10,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #define PNG_BYTES_TO_CHECK 4
diff --git a/src/modules/evas/loaders/psd/evas_image_load_psd.c b/src/modules/evas/loaders/psd/evas_image_load_psd.c
index ab9cc701a4..d11a7f67b8 100644
--- a/src/modules/evas/loaders/psd/evas_image_load_psd.c
+++ b/src/modules/evas/loaders/psd/evas_image_load_psd.c
@@ -23,7 +23,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 typedef struct _PSD_Header PSD_Header;
diff --git a/src/modules/evas/loaders/tga/evas_image_load_tga.c b/src/modules/evas/loaders/tga/evas_image_load_tga.c
index 87294022f6..8a482c467a 100644
--- a/src/modules/evas/loaders/tga/evas_image_load_tga.c
+++ b/src/modules/evas/loaders/tga/evas_image_load_tga.c
@@ -10,7 +10,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 /* TGA pixel formats */
diff --git a/src/modules/evas/loaders/tiff/evas_image_load_tiff.c b/src/modules/evas/loaders/tiff/evas_image_load_tiff.c
index 29248f6a75..260a8b864c 100644
--- a/src/modules/evas/loaders/tiff/evas_image_load_tiff.c
+++ b/src/modules/evas/loaders/tiff/evas_image_load_tiff.c
@@ -11,7 +11,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 static int _evas_loader_tiff_log_dom = -1;
diff --git a/src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c b/src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c
index a2dc24d973..1726b55ce4 100644
--- a/src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c
+++ b/src/modules/evas/loaders/wbmp/evas_image_load_wbmp.c
@@ -8,7 +8,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 static int
diff --git a/src/modules/evas/loaders/webp/evas_image_load_webp.c b/src/modules/evas/loaders/webp/evas_image_load_webp.c
index e6d66f8c74..69ac690932 100644
--- a/src/modules/evas/loaders/webp/evas_image_load_webp.c
+++ b/src/modules/evas/loaders/webp/evas_image_load_webp.c
@@ -10,7 +10,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 static Eina_Bool
diff --git a/src/modules/evas/loaders/xpm/evas_image_load_xpm.c b/src/modules/evas/loaders/xpm/evas_image_load_xpm.c
index cc94709aad..f09a8a222d 100644
--- a/src/modules/evas/loaders/xpm/evas_image_load_xpm.c
+++ b/src/modules/evas/loaders/xpm/evas_image_load_xpm.c
@@ -6,7 +6,7 @@
 # include <Evil.h>
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 static int _evas_loader_xpm_log_dom = -1;
diff --git a/src/modules/evas/savers/eet/evas_image_save_eet.c b/src/modules/evas/savers/eet/evas_image_save_eet.c
index 26d58d47ca..64e903b510 100644
--- a/src/modules/evas/savers/eet/evas_image_save_eet.c
+++ b/src/modules/evas/savers/eet/evas_image_save_eet.c
@@ -4,7 +4,7 @@
 
 #include <Eet.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 static int evas_image_save_file_eet(RGBA_Image *im, const char *file, const char *key, int quality, int compress);
diff --git a/src/modules/evas/savers/jpeg/evas_image_save_jpeg.c b/src/modules/evas/savers/jpeg/evas_image_save_jpeg.c
index c653c77cde..b0cf5f8a11 100644
--- a/src/modules/evas/savers/jpeg/evas_image_save_jpeg.c
+++ b/src/modules/evas/savers/jpeg/evas_image_save_jpeg.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include <stdio.h>
diff --git a/src/modules/evas/savers/png/evas_image_save_png.c b/src/modules/evas/savers/png/evas_image_save_png.c
index ab75681978..cc3144128d 100644
--- a/src/modules/evas/savers/png/evas_image_save_png.c
+++ b/src/modules/evas/savers/png/evas_image_save_png.c
@@ -18,7 +18,7 @@
 # define E_FCLOSE(stream) fclose(stream)
 #endif
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 static int evas_image_save_file_png(RGBA_Image *im, const char *file, const char *key, int quality, int compress);
diff --git a/src/modules/evas/savers/tiff/evas_image_save_tiff.c b/src/modules/evas/savers/tiff/evas_image_save_tiff.c
index 9cef969dd0..84c73bb640 100644
--- a/src/modules/evas/savers/tiff/evas_image_save_tiff.c
+++ b/src/modules/evas/savers/tiff/evas_image_save_tiff.c
@@ -1,4 +1,4 @@
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 #include <tiffio.h>
diff --git a/src/modules/evas/savers/webp/evas_image_save_webp.c b/src/modules/evas/savers/webp/evas_image_save_webp.c
index 9c2cbd1542..2c27b3602c 100644
--- a/src/modules/evas/savers/webp/evas_image_save_webp.c
+++ b/src/modules/evas/savers/webp/evas_image_save_webp.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <webp/encode.h>
 
-#include "evas_common.h"
+#include "evas_common_private.h"
 #include "evas_private.h"
 
 static int evas_image_save_file_webp(RGBA_Image *im, const char *file, const char *key, int quality, int compress);