diff --git a/src/lib/evas/canvas/evas_vg_node.c b/src/lib/evas/canvas/evas_vg_node.c
index 7197f891ff..93be7670c5 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -22,7 +22,7 @@ _efl_vg_base_property_changed(void *data, Eo *obj, const Eo_Event_Description *d
    return EINA_TRUE;
 }
 
-void
+static void
 _efl_vg_base_transformation_set(Eo *obj,
                                 Efl_VG_Base_Data *pd,
                                 const Eina_Matrix3 *m)
@@ -43,7 +43,7 @@ _efl_vg_base_transformation_get(Eo *obj EINA_UNUSED, Efl_VG_Base_Data *pd)
    return pd->m;
 }
 
-void
+static void
 _efl_vg_base_origin_set(Eo *obj,
                         Efl_VG_Base_Data *pd,
                         double x, double y)
@@ -54,7 +54,7 @@ _efl_vg_base_origin_set(Eo *obj,
    _efl_vg_base_changed(obj);
 }
 
-void
+static void
 _efl_vg_base_origin_get(Eo *obj EINA_UNUSED,
                         Efl_VG_Base_Data *pd,
                         double *x, double *y)
@@ -63,7 +63,7 @@ _efl_vg_base_origin_get(Eo *obj EINA_UNUSED,
    if (y) *y = pd->y;
 }
 
-void
+static void
 _efl_vg_base_efl_gfx_base_position_set(Eo *obj EINA_UNUSED,
                                        Efl_VG_Base_Data *pd,
                                        int x, int y)
@@ -74,7 +74,7 @@ _efl_vg_base_efl_gfx_base_position_set(Eo *obj EINA_UNUSED,
    _efl_vg_base_changed(obj);
 }
 
-void
+static void
 _efl_vg_base_efl_gfx_base_position_get(Eo *obj EINA_UNUSED,
                                        Efl_VG_Base_Data *pd,
                                        int *x, int *y)
@@ -83,7 +83,7 @@ _efl_vg_base_efl_gfx_base_position_get(Eo *obj EINA_UNUSED,
    if (y) *y = pd->y;
 }
 
-void
+static void
 _efl_vg_base_efl_gfx_base_visible_set(Eo *obj EINA_UNUSED,
                                       Efl_VG_Base_Data *pd, Eina_Bool v)
 {
@@ -93,14 +93,14 @@ _efl_vg_base_efl_gfx_base_visible_set(Eo *obj EINA_UNUSED,
 }
 
 
-Eina_Bool
+static Eina_Bool
 _efl_vg_base_efl_gfx_base_visible_get(Eo *obj EINA_UNUSED,
                                       Efl_VG_Base_Data *pd)
 {
    return pd->visibility;
 }
 
-void
+static void
 _efl_vg_base_efl_gfx_base_color_set(Eo *obj EINA_UNUSED,
                                     Efl_VG_Base_Data *pd,
                                     int r, int g, int b, int a)
@@ -133,7 +133,7 @@ _efl_vg_base_efl_gfx_base_color_set(Eo *obj EINA_UNUSED,
    _efl_vg_base_changed(obj);
 }
 
-Eina_Bool
+static Eina_Bool
 _efl_vg_base_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Base_Data *pd,
                                          const char *part,
                                          int r, int g, int b, int a)
@@ -144,7 +144,7 @@ _efl_vg_base_efl_gfx_base_color_part_set(Eo *obj, Efl_VG_Base_Data *pd,
    return EINA_TRUE;
 }
 
-void
+static void
 _efl_vg_base_efl_gfx_base_color_get(Eo *obj EINA_UNUSED,
                                     Efl_VG_Base_Data *pd,
                                     int *r, int *g, int *b, int *a)
@@ -155,7 +155,7 @@ _efl_vg_base_efl_gfx_base_color_get(Eo *obj EINA_UNUSED,
    if (a) *a = pd->a;
 }
 
-Eina_Bool
+static Eina_Bool
 _efl_vg_base_efl_gfx_base_color_part_get(Eo *obj, Efl_VG_Base_Data *pd,
                                          const char *part,
                                          int *r, int *g, int *b, int *a)
@@ -166,7 +166,7 @@ _efl_vg_base_efl_gfx_base_color_part_get(Eo *obj, Efl_VG_Base_Data *pd,
    return EINA_TRUE;
 }
 
-void
+static void
 _efl_vg_base_mask_set(Eo *obj EINA_UNUSED,
                        Efl_VG_Base_Data *pd,
                        Efl_VG_Base *r)
@@ -179,13 +179,13 @@ _efl_vg_base_mask_set(Eo *obj EINA_UNUSED,
    _efl_vg_base_changed(obj);
 }
 
-Efl_VG_Base*
+static Efl_VG_Base*
 _efl_vg_base_mask_get(Eo *obj EINA_UNUSED, Efl_VG_Base_Data *pd)
 {
    return pd->mask;
 }
 
-void
+static void
 _efl_vg_base_efl_gfx_base_size_get(Eo *obj,
                                    Efl_VG_Base_Data *pd EINA_UNUSED,
                                    int *w, int *h)
@@ -229,7 +229,7 @@ _efl_vg_base_parent_checked_get(Eo *obj,
    return EINA_FALSE;
 }
 
-void
+static void
 _efl_vg_base_eo_base_constructor(Eo *obj,
                                  Efl_VG_Base_Data *pd)
 {
@@ -245,7 +245,7 @@ _efl_vg_base_eo_base_constructor(Eo *obj,
    pd->changed = EINA_TRUE;
 }
 
-void
+static void
 _efl_vg_base_eo_base_parent_set(Eo *obj,
                                 Efl_VG_Base_Data *pd EINA_UNUSED,
                                 Eo *parent)
@@ -291,7 +291,7 @@ _efl_vg_base_eo_base_parent_set(Eo *obj,
    return ;
 }
 
-void
+static void
 _efl_vg_base_efl_gfx_stack_raise(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
 {
    Efl_VG_Container_Data *cd;
@@ -319,7 +319,7 @@ _efl_vg_base_efl_gfx_stack_raise(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
    eo_error_set(obj);
 }
 
-void
+static void
 _efl_vg_base_efl_gfx_stack_stack_above(Eo *obj,
                                        Efl_VG_Base_Data *pd EINA_UNUSED,
                                        Efl_Gfx_Stack *above)
@@ -349,7 +349,7 @@ _efl_vg_base_efl_gfx_stack_stack_above(Eo *obj,
    eo_error_set(obj);
 }
 
-void
+static void
 _efl_vg_base_efl_gfx_stack_stack_below(Eo *obj,
                                        Efl_VG_Base_Data *pd EINA_UNUSED,
                                        Efl_Gfx_Stack *below)
@@ -379,7 +379,7 @@ _efl_vg_base_efl_gfx_stack_stack_below(Eo *obj,
    eo_error_set(obj);
 }
 
-void
+static void
 _efl_vg_base_efl_gfx_stack_lower(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
 {
    Efl_VG_Container_Data *cd;
@@ -407,21 +407,21 @@ _efl_vg_base_efl_gfx_stack_lower(Eo *obj, Efl_VG_Base_Data *pd EINA_UNUSED)
    eo_error_set(obj);
 }
 
-Efl_Gfx_Stack *
+static Efl_Gfx_Stack *
 _efl_vg_base_efl_gfx_stack_below_get(Eo *obj EINA_UNUSED, Efl_VG_Base_Data *pd EINA_UNUSED)
 {
    // Actually a VG base node won't have any children so nothing stacked below it.
    return NULL;
 }
 
-Efl_Gfx_Stack *
+static Efl_Gfx_Stack *
 _efl_vg_base_efl_gfx_stack_above_get(Eo *obj, Efl_VG_Base_Data *pd)
 {
    // FIXME bound get every child of my parent and go up until vg root
    return NULL;
 }
 
-Eina_Bool
+static Eina_Bool
 _efl_vg_base_original_bound_get(Eo *obj,
                                 Efl_VG_Base_Data *pd,
                                 Eina_Rectangle *r)
diff --git a/src/lib/evas/canvas/evas_vg_root_node.c b/src/lib/evas/canvas/evas_vg_root_node.c
index 8362dfde6d..65dbb0220f 100644
--- a/src/lib/evas/canvas/evas_vg_root_node.c
+++ b/src/lib/evas/canvas/evas_vg_root_node.c
@@ -47,7 +47,7 @@ _evas_vg_root_node_changed(void *data, Eo *obj,
    return EINA_TRUE;
 }
 
-void
+static void
 _efl_vg_root_node_eo_base_parent_set(Eo *obj,
                                      Efl_VG_Root_Node_Data *pd,
                                      Eo *parent)
@@ -65,7 +65,7 @@ _efl_vg_root_node_eo_base_parent_set(Eo *obj,
      }
 }
 
-void
+static void
 _efl_vg_root_node_eo_base_constructor(Eo *obj,
                                       Efl_VG_Root_Node_Data *pd)
 {