summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorSebastian Dransfeld <sebastian.dransfeld@sintef.no>2013-06-20 12:53:29 +0200
committerSebastian Dransfeld <sebastian.dransfeld@sintef.no>2013-06-20 12:53:29 +0200
commit51023d2d4fd9fbde2e376d32b29dc7b37da70919 (patch)
treeac8c51e9e9521d7e5532e9f5185834ed0642bc3e /src/lib
parent9aada5f7359ebe6032a0db902b4171887d2f898a (diff)
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.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/evas/Evas.h2
-rw-r--r--src/lib/evas/Evas_Common.h (renamed from src/lib/evas/Evas_Common_Header.h)0
-rw-r--r--src/lib/evas/cache/evas_cache_engine_image.c2
-rw-r--r--src/lib/evas/cache/evas_cache_image.c2
-rw-r--r--src/lib/evas/cache/evas_preload.c2
-rw-r--r--src/lib/evas/cache2/evas_cache2.c2
-rw-r--r--src/lib/evas/canvas/common_interfaces.c2
-rw-r--r--src/lib/evas/canvas/evas_async_events.c2
-rw-r--r--src/lib/evas/canvas/evas_callbacks.c2
-rw-r--r--src/lib/evas/canvas/evas_clip.c2
-rw-r--r--src/lib/evas/canvas/evas_common_interface.c2
-rw-r--r--src/lib/evas/canvas/evas_data.c2
-rw-r--r--src/lib/evas/canvas/evas_device.c2
-rw-r--r--src/lib/evas/canvas/evas_events.c2
-rw-r--r--src/lib/evas/canvas/evas_focus.c2
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c2
-rw-r--r--src/lib/evas/canvas/evas_gl.c2
-rw-r--r--src/lib/evas/canvas/evas_key.c2
-rw-r--r--src/lib/evas/canvas/evas_key_grab.c2
-rw-r--r--src/lib/evas/canvas/evas_layer.c2
-rw-r--r--src/lib/evas/canvas/evas_main.c2
-rw-r--r--src/lib/evas/canvas/evas_map.c2
-rw-r--r--src/lib/evas/canvas/evas_name.c2
-rw-r--r--src/lib/evas/canvas/evas_object_box.c2
-rw-r--r--src/lib/evas/canvas/evas_object_grid.c2
-rw-r--r--src/lib/evas/canvas/evas_object_image.c2
-rw-r--r--src/lib/evas/canvas/evas_object_inform.c2
-rw-r--r--src/lib/evas/canvas/evas_object_intercept.c2
-rw-r--r--src/lib/evas/canvas/evas_object_line.c2
-rw-r--r--src/lib/evas/canvas/evas_object_main.c2
-rw-r--r--src/lib/evas/canvas/evas_object_polygon.c2
-rw-r--r--src/lib/evas/canvas/evas_object_rectangle.c2
-rw-r--r--src/lib/evas/canvas/evas_object_smart.c2
-rw-r--r--src/lib/evas/canvas/evas_object_smart_clipped.c2
-rw-r--r--src/lib/evas/canvas/evas_object_table.c2
-rw-r--r--src/lib/evas/canvas/evas_object_text.c2
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c2
-rw-r--r--src/lib/evas/canvas/evas_object_textgrid.c2
-rw-r--r--src/lib/evas/canvas/evas_out.c2
-rw-r--r--src/lib/evas/canvas/evas_rectangle.c2
-rw-r--r--src/lib/evas/canvas/evas_render.c2
-rw-r--r--src/lib/evas/canvas/evas_smart.c2
-rw-r--r--src/lib/evas/canvas/evas_stack.c2
-rw-r--r--src/lib/evas/canvas/evas_stats.c2
-rw-r--r--src/lib/evas/canvas/evas_touch_point.c2
-rw-r--r--src/lib/evas/common/evas_blend_main.c2
-rw-r--r--src/lib/evas/common/evas_blit_main.c2
-rw-r--r--src/lib/evas/common/evas_convert_color.c2
-rw-r--r--src/lib/evas/common/evas_convert_colorspace.c2
-rw-r--r--src/lib/evas/common/evas_convert_gry_1.c2
-rw-r--r--src/lib/evas/common/evas_convert_gry_8.c2
-rw-r--r--src/lib/evas/common/evas_convert_grypal_6.c2
-rw-r--r--src/lib/evas/common/evas_convert_main.c2
-rw-r--r--src/lib/evas/common/evas_convert_rgb_16.c2
-rw-r--r--src/lib/evas/common/evas_convert_rgb_24.c2
-rw-r--r--src/lib/evas/common/evas_convert_rgb_32.c2
-rw-r--r--src/lib/evas/common/evas_convert_rgb_8.c2
-rw-r--r--src/lib/evas/common/evas_convert_yuv.c2
-rw-r--r--src/lib/evas/common/evas_cpu.c2
-rw-r--r--src/lib/evas/common/evas_draw_main.c2
-rw-r--r--src/lib/evas/common/evas_font_draw.c2
-rw-r--r--src/lib/evas/common/evas_font_load.c2
-rw-r--r--src/lib/evas/common/evas_font_main.c2
-rw-r--r--src/lib/evas/common/evas_font_ot.c2
-rw-r--r--src/lib/evas/common/evas_font_query.c2
-rw-r--r--src/lib/evas/common/evas_image_data.c2
-rw-r--r--src/lib/evas/common/evas_image_load.c2
-rw-r--r--src/lib/evas/common/evas_image_main.c2
-rw-r--r--src/lib/evas/common/evas_image_save.c2
-rw-r--r--src/lib/evas/common/evas_image_scalecache.c2
-rw-r--r--src/lib/evas/common/evas_line_main.c2
-rw-r--r--src/lib/evas/common/evas_map_image.c2
-rw-r--r--src/lib/evas/common/evas_op_add_main_.c2
-rw-r--r--src/lib/evas/common/evas_op_blend/op_blend_master_sse3.c2
-rw-r--r--src/lib/evas/common/evas_op_blend_main_.c2
-rw-r--r--src/lib/evas/common/evas_op_copy_main_.c2
-rw-r--r--src/lib/evas/common/evas_op_mask_main_.c2
-rw-r--r--src/lib/evas/common/evas_op_mul_main_.c2
-rw-r--r--src/lib/evas/common/evas_op_sub_main_.c2
-rw-r--r--src/lib/evas/common/evas_pipe.c2
-rw-r--r--src/lib/evas/common/evas_polygon_main.c2
-rw-r--r--src/lib/evas/common/evas_rectangle_main.c2
-rw-r--r--src/lib/evas/common/evas_regionbuf.c2
-rw-r--r--src/lib/evas/common/evas_scale_main.c2
-rw-r--r--src/lib/evas/common/evas_scale_sample.c2
-rw-r--r--src/lib/evas/common/evas_scale_smooth.c2
-rw-r--r--src/lib/evas/common/evas_scale_span.c2
-rw-r--r--src/lib/evas/common/evas_text_utils.c2
-rw-r--r--src/lib/evas/common/evas_thread_render.c2
-rw-r--r--src/lib/evas/common/evas_tiler.c2
-rw-r--r--src/lib/evas/common/language/evas_bidi_utils.c2
-rw-r--r--src/lib/evas/cserve2/evas_cs2_private.h2
-rw-r--r--src/lib/evas/file/evas_module.c2
-rw-r--r--src/lib/evas/file/evas_path.c2
-rw-r--r--src/lib/evas/include/evas_common_private.h (renamed from src/lib/evas/include/evas_common.h)0
-rw-r--r--src/lib/evas/main.c2
96 files changed, 94 insertions, 94 deletions
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 @@
283extern "C" { 283extern "C" {
284#endif 284#endif
285 285
286#include <Evas_Common_Header.h> 286#include <Evas_Common.h>
287#ifndef EFL_NOLEGACY_API_SUPPORT 287#ifndef EFL_NOLEGACY_API_SUPPORT
288#include <Evas_Legacy.h> 288#include <Evas_Legacy.h>
289#endif 289#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 @@
4 4
5#include <assert.h> 5#include <assert.h>
6 6
7#include "evas_common.h" 7#include "evas_common_private.h"
8#include "evas_private.h" 8#include "evas_private.h"
9 9
10static void 10static 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 @@
12# include <Evil.h> 12# include <Evil.h>
13#endif 13#endif
14 14
15#include "evas_common.h" 15#include "evas_common_private.h"
16#include "evas_private.h" 16#include "evas_private.h"
17 17
18//#define CACHEDUMP 1 18//#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 @@
7#ifdef __linux__ 7#ifdef __linux__
8# include <sys/syscall.h> 8# include <sys/syscall.h>
9#endif 9#endif
10#include "evas_common.h" 10#include "evas_common_private.h"
11#include "evas_private.h" 11#include "evas_private.h"
12#include "Evas.h" 12#include "Evas.h"
13 13
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 @@
12# include <Evil.h> 12# include <Evil.h>
13#endif 13#endif
14 14
15#include "evas_common.h" 15#include "evas_common_private.h"
16#include "evas_private.h" 16#include "evas_private.h"
17#include "evas_cache2.h" 17#include "evas_cache2.h"
18#include "evas_cs2.h" 18#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#include "Eo.h" 4#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 @@
8#include <fcntl.h> 8#include <fcntl.h>
9#include <errno.h> 9#include <errno.h>
10 10
11#include "evas_common.h" 11#include "evas_common_private.h"
12#include "evas_private.h" 12#include "evas_private.h"
13 13
14typedef struct _Evas_Event_Async Evas_Event_Async; 14typedef 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4int _evas_event_counter = 0; 4int _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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4void 4void
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#include "Eo.h" 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4 4
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4EAPI Evas_Device * 4EAPI 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4static Eina_List * 4static 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4/* private calls */ 4/* 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 @@
12#include <fontconfig/fontconfig.h> 12#include <fontconfig/fontconfig.h>
13#endif 13#endif
14 14
15#include "evas_common.h" 15#include "evas_common_private.h"
16#include "evas_private.h" 16#include "evas_private.h"
17 17
18/* font dir cache */ 18/* 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 @@
1/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/ 1/* vim:set ts=8 sw=3 sts=3 expandtab cino=>5n-2f0^-2{2(0W1st0 :*/
2#include "evas_common.h" 2#include "evas_common_private.h"
3#include "evas_private.h" 3#include "evas_private.h"
4#include "Evas_GL.h" 4#include "Evas_GL.h"
5 5
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4/* private calls */ 4/* 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4/* private calls */ 4/* 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4static void _evas_layer_free(Evas_Layer *lay); 4static 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3//#include "evas_cs.h" 3//#include "evas_cs.h"
4#ifdef EVAS_CSERVE2 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3#include <math.h> 3#include <math.h>
4 4
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4EAPI void 4EAPI 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#ifdef _WIN32_WCE 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3#include <errno.h> 3#include <errno.h>
4 4
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 @@
10#endif 10#endif
11#include <math.h> 11#include <math.h>
12 12
13#include "evas_common.h" 13#include "evas_common_private.h"
14#include "evas_private.h" 14#include "evas_private.h"
15#ifdef EVAS_CSERVE2 15#ifdef EVAS_CSERVE2
16#include "../cserve2/evas_cs2_private.h" 16#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4/* local calls */ 4/* 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4/* local calls */ 4/* 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#include "Eo.h" 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4EVAS_MEMPOOL(_mp_sh); 4EVAS_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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#include "Eo.h" 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#include "Eo.h" 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#include "Eo.h" 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4EAPI Eo_Op EVAS_OBJ_SMART_CLIPPED_BASE_ID = EO_NOOP; 4EAPI 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3#include <errno.h> 3#include <errno.h>
4 4
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 @@
1#include "evas_common.h" /* Includes evas_bidi_utils stuff. */ 1#include "evas_common_private.h" /* Includes evas_bidi_utils stuff. */
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#include "Eo.h" 4#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 @@
61 * @subsection textblock_layout The layout system 61 * @subsection textblock_layout The layout system
62 * @todo write @ref textblock_layout 62 * @todo write @ref textblock_layout
63 */ 63 */
64#include "evas_common.h" 64#include "evas_common_private.h"
65#include "evas_private.h" 65#include "evas_private.h"
66#include <stdlib.h> 66#include <stdlib.h>
67 67
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 @@
1#include "evas_common.h" /* Includes evas_bidi_utils stuff. */ 1#include "evas_common_private.h" /* Includes evas_bidi_utils stuff. */
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4#include "Eo.h" 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3//#include "evas_cs.h" 3//#include "evas_cs.h"
4#ifdef EVAS_CSERVE2 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4void 4void
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3#include <math.h> 3#include <math.h>
4#ifdef EVAS_CSERVE2 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4 4
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4static Evas_Object_Protected_Data * 4static 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3//#include "evas_cs.h" 3//#include "evas_cs.h"
4 4
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4void 4void
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_blend_private.h" 2#include "evas_blend_private.h"
3 3
4#ifdef BUILD_MMX 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2 2
3#ifdef BUILD_MMX 3#ifdef BUILD_MMX
4#include "evas_mmx.h" 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_color.h" 2#include "evas_convert_color.h"
3 3
4 4
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_colorspace.h" 2#include "evas_convert_colorspace.h"
3 3
4#define CONVERT_RGB_565_TO_RGB_888(s) \ 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_gry_1.h" 2#include "evas_convert_gry_1.h"
3 3
4void 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) 4void 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_gry_8.h" 2#include "evas_convert_gry_8.h"
3 3
4#ifdef USE_DITHER_44 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_grypal_6.h" 2#include "evas_convert_grypal_6.h"
3 3
4void 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) 4void 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_rgb_8.h" 2#include "evas_convert_rgb_8.h"
3#include "evas_convert_rgb_16.h" 3#include "evas_convert_rgb_16.h"
4#include "evas_convert_rgb_24.h" 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_rgb_16.h" 2#include "evas_convert_rgb_16.h"
3 3
4#ifndef BUILD_NO_DITHER_MASK 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_rgb_24.h" 2#include "evas_convert_rgb_24.h"
3 3
4void 4void
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_rgb_32.h" 2#include "evas_convert_rgb_32.h"
3 3
4void 4void
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_rgb_8.h" 2#include "evas_convert_rgb_8.h"
3 3
4#ifdef USE_DITHER_44 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_yuv.h" 2#include "evas_convert_yuv.h"
3 3
4#ifdef BUILD_MMX 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#ifdef BUILD_MMX 2#ifdef BUILD_MMX
3#include "evas_mmx.h" 3#include "evas_mmx.h"
4#endif 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_main.h" 2#include "evas_convert_main.h"
3#include "evas_private.h" 3#include "evas_private.h"
4 4
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3#include "evas_blend_private.h" 3#include "evas_blend_private.h"
4 4
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 @@
10# include <hb.h> 10# include <hb.h>
11#endif 11#endif
12 12
13#include "evas_common.h" 13#include "evas_common_private.h"
14#include "evas_private.h" 14#include "evas_private.h"
15 15
16#include "evas_font_private.h" /* for Frame-Queuing support */ 16#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 @@
4 4
5#include <assert.h> 5#include <assert.h>
6 6
7#include "evas_common.h" 7#include "evas_common_private.h"
8#include "evas_private.h" 8#include "evas_private.h"
9 9
10#include "evas_font_private.h" 10#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 @@
5# include <hb-ft.h> 5# include <hb-ft.h>
6#endif 6#endif
7 7
8#include "evas_common.h" 8#include "evas_common_private.h"
9 9
10#include <Eina.h> 10#include <Eina.h>
11#include "evas_font_private.h" 11#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "language/evas_bidi_utils.h" /*defines BIDI_SUPPORT if possible */ 2#include "language/evas_bidi_utils.h" /*defines BIDI_SUPPORT if possible */
3#include "evas_font_private.h" /* for Frame-Queuing support */ 3#include "evas_font_private.h" /* for Frame-Queuing support */
4#include "evas_font_ot.h" 4#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 @@
4 4
5#include <assert.h> 5#include <assert.h>
6 6
7#include "evas_common.h" 7#include "evas_common_private.h"
8#include "evas_private.h" 8#include "evas_private.h"
9#include "evas_image.h" 9#include "evas_image.h"
10 10
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 @@
6#include <sys/stat.h> 6#include <sys/stat.h>
7#include <unistd.h> 7#include <unistd.h>
8 8
9#include "evas_common.h" 9#include "evas_common_private.h"
10#include "evas_private.h" 10#include "evas_private.h"
11//#include "evas_cs.h" 11//#include "evas_cs.h"
12#ifdef EVAS_CSERVE2 12#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 @@
6# include <Eet.h> 6# include <Eet.h>
7#endif 7#endif
8 8
9#include "evas_common.h" 9#include "evas_common_private.h"
10#include "evas_private.h" 10#include "evas_private.h"
11#include "evas_image_private.h" 11#include "evas_image_private.h"
12#include "evas_convert_yuv.h" 12#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 @@
4 4
5#include "evas_options.h" 5#include "evas_options.h"
6 6
7#include "evas_common.h" 7#include "evas_common_private.h"
8#include "evas_private.h" 8#include "evas_private.h"
9 9
10 10
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 @@
11#ifdef EVAS_CSERVE2 11#ifdef EVAS_CSERVE2
12#include "evas_cs2_private.h" 12#include "evas_cs2_private.h"
13#endif 13#endif
14#include "evas_common.h" 14#include "evas_common_private.h"
15#include "evas_private.h" 15#include "evas_private.h"
16#include "evas_image_private.h" 16#include "evas_image_private.h"
17 17
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_blend_private.h" 2#include "evas_blend_private.h"
3 3
4#define IN_RANGE(x, y, w, h) \ 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3#include "evas_blend_private.h" 3#include "evas_blend_private.h"
4#ifdef EVAS_CSERVE2 4#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2static RGBA_Gfx_Func op_add_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 2static RGBA_Gfx_Func op_add_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
3static RGBA_Gfx_Pt_Func op_add_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 3static RGBA_Gfx_Pt_Func op_add_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
4 4
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 @@
1#define NEED_SSE3 1 1#define NEED_SSE3 1
2 2
3#include "evas_common.h" 3#include "evas_common_private.h"
4 4
5#ifdef BUILD_SSE3 5#ifdef BUILD_SSE3
6static __m128i A_MASK_SSE3; 6static __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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2 2
3RGBA_Gfx_Func op_blend_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 3RGBA_Gfx_Func op_blend_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
4RGBA_Gfx_Pt_Func op_blend_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 4RGBA_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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_blend_private.h" 2#include "evas_blend_private.h"
3 3
4static RGBA_Gfx_Func op_copy_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 4static 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2 2
3static RGBA_Gfx_Func op_mask_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 3static RGBA_Gfx_Func op_mask_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
4static RGBA_Gfx_Pt_Func op_mask_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 4static 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2 2
3static RGBA_Gfx_Func op_mul_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 3static RGBA_Gfx_Func op_mul_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
4static RGBA_Gfx_Pt_Func op_mul_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 4static 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2 2
3static RGBA_Gfx_Func op_sub_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 3static RGBA_Gfx_Func op_sub_span_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST];
4static RGBA_Gfx_Pt_Func op_sub_pt_funcs[SP_LAST][SM_LAST][SC_LAST][DP_LAST][CPU_LAST]; 4static 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include <unistd.h> 2#include <unistd.h>
3 3
4#ifdef BUILD_PIPE_RENDER 4#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 @@
4 4
5#include <math.h> 5#include <math.h>
6 6
7#include "evas_common.h" 7#include "evas_common_private.h"
8#include "evas_blend_private.h" 8#include "evas_blend_private.h"
9 9
10typedef struct _RGBA_Span RGBA_Span; 10typedef 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3#include "evas_blend_private.h" 3#include "evas_blend_private.h"
4 4
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2 2
3#if 0 3#if 0
4Regionbuf * 4Regionbuf *
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4EAPI void 4EAPI 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_blend_private.h" 2#include "evas_blend_private.h"
3 3
4static 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); 4static 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_scale_smooth.h" 2#include "evas_scale_smooth.h"
3#include "evas_blend_private.h" 3#include "evas_blend_private.h"
4 4
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_convert_color.h" 2#include "evas_convert_color.h"
3#include "evas_scale_span.h" 3#include "evas_scale_span.h"
4 4
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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_font_private.h" 2#include "evas_font_private.h"
3#include "evas_text_utils.h" 3#include "evas_text_utils.h"
4#include "language/evas_bidi_utils.h" 4#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 @@
1#include <assert.h> 1#include <assert.h>
2 2
3#include "evas_common.h" 3#include "evas_common_private.h"
4 4
5static Eina_Thread evas_thread_worker; 5static Eina_Thread evas_thread_worker;
6static Eina_Condition evas_thread_queue_condition; 6static 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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#ifdef EVAS_RECT_SPLIT 2#ifdef EVAS_RECT_SPLIT
3 3
4static inline void rect_list_node_pool_set_max(int max); 4static 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 @@
5#include <string.h> 5#include <string.h>
6#include <stdlib.h> 6#include <stdlib.h>
7 7
8#include "evas_common.h" 8#include "evas_common_private.h"
9#include "evas_bidi_utils.h" 9#include "evas_bidi_utils.h"
10 10
11#include "evas_font_private.h" 11#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 @@
1#ifndef EVAS_CS2_PRIVATE_H 1#ifndef EVAS_CS2_PRIVATE_H
2#define EVAS_CS2_PRIVATE_H 1 2#define EVAS_CS2_PRIVATE_H 1
3 3
4#include "evas_common.h" 4#include "evas_common_private.h"
5 5
6struct _Data_Entry { 6struct _Data_Entry {
7 unsigned int image_id; 7 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 @@
4 4
5#include <string.h> 5#include <string.h>
6 6
7#include "evas_common.h" 7#include "evas_common_private.h"
8#include "evas_private.h" 8#include "evas_private.h"
9 9
10 10
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 @@
22# include <Evil.h> 22# include <Evil.h>
23#endif 23#endif
24 24
25#include "evas_common.h" 25#include "evas_common_private.h"
26#include "evas_private.h" 26#include "evas_private.h"
27 27
28#ifdef _WIN32 28#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 @@
1#include "evas_common.h" 1#include "evas_common_private.h"
2#include "evas_private.h" 2#include "evas_private.h"
3 3
4static Evas_Version _version = { VMAJ, VMIN, VMIC, VREV }; 4static Evas_Version _version = { VMAJ, VMIN, VMIC, VREV };