diff --git a/legacy/edje/src/bin/edje_cc_parse.c b/legacy/edje/src/bin/edje_cc_parse.c
index e5ae0a8a5e..02d45d4ac5 100644
--- a/legacy/edje/src/bin/edje_cc_parse.c
+++ b/legacy/edje/src/bin/edje_cc_parse.c
@@ -758,7 +758,7 @@ parse_float_range(int n, double f, double t)
 
 /* int set of function */
 
-int
+static int
 my_atoi(const char * s)
 {
    int res = 0;
@@ -793,10 +793,10 @@ my_atoi(const char * s)
    return res;
 }
 
-char *
+static char *
 _deltai(char *s, int * val)
 {
-   if (!val) return;
+   if (!val) return NULL;
    
    if ('(' != s[0])
      { 
@@ -815,10 +815,10 @@ _deltai(char *s, int * val)
    return s;
 }
 
-char *
+static char *
 _gammai(char *s, int * val)
 {
-   if (!val) return;
+   if (!val) return NULL;
    
    if (_is_numi(s[0]))
      {
@@ -836,14 +836,14 @@ _gammai(char *s, int * val)
    return s;
 }
 
-char *
+static char *
 _betai(char *s, int * val)
 {
    int a1, a2;
    char op;
    
    if (!val)
-     return;
+     return NULL;
    
    s = _gammai(s, &a1);
    
@@ -860,14 +860,14 @@ _betai(char *s, int * val)
    return s;
 }
 
-char *
+static char *
 _alphai(char *s, int * val)
 {
    int a1, a2;
    char op;
    
    if (!val)
-     return;
+     return NULL;
    
    s = _betai(s, &a1);
    
@@ -1005,10 +1005,10 @@ my_atof(const char * s)
    return res;
 }
 
-char *
+static char *
 _deltaf(char *s, double * val)
 {
-   if (!val) return;
+   if (!val) return NULL;
    
    if ('(' != s[0])
      {
@@ -1027,10 +1027,10 @@ _deltaf(char *s, double * val)
    return s;
 }
 
-char *
+static char *
 _gammaf(char *s, double * val)
 {
-   if (!val) return;
+   if (!val) return NULL;
    
    if (_is_numf(s[0]))
      {
@@ -1048,14 +1048,14 @@ _gammaf(char *s, double * val)
    return s;
 }
 
-char *
+static char *
 _betaf(char *s, double * val)
 {
    double a1=0, a2=0;
    char op;
    
    if (!val)
-     return;
+     return NULL;
    
    s = _gammaf(s, &a1);
    
@@ -1072,14 +1072,14 @@ _betaf(char *s, double * val)
    return s;
 }
 
-char *
+static char *
 _alphaf(char *s, double * val)
 {
    double a1=0, a2=0;
    char op;
    
    if (!val)
-     return;
+     return NULL;
    
    s = _betaf(s, &a1);
    
@@ -1096,7 +1096,7 @@ _alphaf(char *s, double * val)
    return s;
 }
 
-char *
+static char *
 _get_numf(char *s, double * val)
 {
    char buf[4096];
@@ -1120,7 +1120,7 @@ _get_numf(char *s, double * val)
    return (s+pos);
 }
 
-int
+static int
 _is_numf(char c)
 {
    if (((c >= '0') && (c <= '9')) 
@@ -1132,7 +1132,7 @@ _is_numf(char c)
      return 0;
 }
 
-int
+static int
 _is_op1f(char c)
 {
    switch(c)
@@ -1144,7 +1144,7 @@ _is_op1f(char c)
    return 0;
 }
 
-int
+static int
 _is_op2f(char c)
 {
    switch(c)
@@ -1156,7 +1156,7 @@ _is_op2f(char c)
    return 0;
 }
 
-double
+static double
 _calcf(char op, double a, double b)
 {
    switch(op)
diff --git a/legacy/edje/src/lib/edje_container.c b/legacy/edje/src/lib/edje_container.c
index e3efd5a228..4e6217491d 100644
--- a/legacy/edje/src/lib/edje_container.c
+++ b/legacy/edje/src/lib/edje_container.c
@@ -6,7 +6,7 @@ static void
 _edje_container_relayout(Smart_Data *sd)
 {
    Evas_List *l;
-   Evas_Coord x, y, w, h, sw, sh;
+   Evas_Coord x, y, w, h, sw;
    
    if (sd->freeze > 0) return;
    if (!sd->need_layout) return;
diff --git a/legacy/edje/src/lib/edje_edit.c b/legacy/edje/src/lib/edje_edit.c
index 4f8d72f475..5bd630051d 100644
--- a/legacy/edje/src/lib/edje_edit.c
+++ b/legacy/edje/src/lib/edje_edit.c
@@ -155,37 +155,44 @@ edje_edit_file_part_collection_get(Edje_Edit_File *edf, char *collection_name)
 Edje_Part_Collection *
 edje_edit_part_collection_add(Edje_Edit_File *edf, char *collection_name)
 {
+	return NULL;
 }
 
 Edje_Part_Collection *
 edje_edit_part_collection_del(Edje_Edit_File *edf, char *collection_name)
 {
+	return NULL;
 }
 
 Edje_Part *
 edje_edit_part_add(Edje_Part_Collection *coll, char *part_name, int part_type)
 {
+	return NULL;
 }
 
 Edje_Part *
 edje_edit_part_del(Edje_Part_Collection *coll, char *part_name, int part_type)
 {
+	return NULL;
 }
 
 Edje_Program *
 edje_edit_program_add(Edje_Part_Collection *coll, char *prog_name)
 {
+	return NULL;
 }
 
 Edje_Program *
 edje_edit_program_del(Edje_Part_Collection *coll, char *prog_name)
 {
+	return NULL;
 }
 
 
 Edje_Edit_Image *
 edje_edit_image_add(Edje_Edit_File *edf, char *filename)
 {
+	return NULL;
 }
 
 void
@@ -197,6 +204,7 @@ edje_edit_image_del(Edje_Edit_Image *im)
 Edje_Edit_Image *
 edje_edit_iamge_get_by_id(int id)
 {
+	return NULL;
 }
 
 
diff --git a/legacy/edje/src/lib/edje_embryo.c b/legacy/edje/src/lib/edje_embryo.c
index 5e053a9c1b..5d6bde4cf3 100644
--- a/legacy/edje/src/lib/edje_embryo.c
+++ b/legacy/edje/src/lib/edje_embryo.c
@@ -392,7 +392,6 @@ static Embryo_Cell
 _edje_embryo_fn_set_min_size(Embryo_Program *ep, Embryo_Cell *params)
 {
     Edje *ed;
-   int part_id = 0;
    float f = 0.0;
    double w = 0.0, h = 0.0;
    
@@ -417,7 +416,6 @@ static Embryo_Cell
 _edje_embryo_fn_set_max_size(Embryo_Program *ep, Embryo_Cell *params)
 {
    Edje *ed;
-   int part_id = 0;
    float f = 0.0;
    double w = 0.0, h = 0.0;
    
@@ -443,7 +441,6 @@ static Embryo_Cell
 _edje_embryo_fn_stop_program(Embryo_Program *ep, Embryo_Cell *params)
 {
    Edje *ed;
-   char *state1 = NULL, *state2 = NULL;
    int program_id = 0;
    Edje_Running_Program *runp;
    Evas_List *l;
@@ -467,7 +464,6 @@ _edje_embryo_fn_stop_programs_on(Embryo_Program *ep, Embryo_Cell *params)
 {
    Edje *ed;
    
-   char *state1 = NULL, *state2 = NULL;
    int part_id = 0;
    Edje_Real_Part *rp;
    
@@ -585,7 +581,6 @@ static Embryo_Cell
 _edje_embryo_fn_run_program(Embryo_Program *ep, Embryo_Cell *params)
 {
    Edje *ed;
-   char *state1 = NULL, *state2 = NULL;
    int program_id = 0;
    Edje_Program *pr;
    
@@ -1239,7 +1234,6 @@ _edje_embryo_test_run(Edje *ed, char *fname, char *sig, char *src)
    if (fn != EMBRYO_FUNCTION_NONE)
      {
 	void *pdata;
-	int err;
 	
 	printf("EDJE DEBUG: About to run script from program.\n");
 	embryo_parameter_string_push(ed->collection->script, sig);
diff --git a/legacy/edje/src/lib/edje_message_queue.c b/legacy/edje/src/lib/edje_message_queue.c
index d0540534b0..403ac3ecfe 100644
--- a/legacy/edje/src/lib/edje_message_queue.c
+++ b/legacy/edje/src/lib/edje_message_queue.c
@@ -83,8 +83,7 @@ _edje_message_free(Edje_Message *em)
 {
    if (em->msg)
      {
-	char *ptr;
-	int i, count;
+	int i;
 	
 	switch (em->type)
 	  {
diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h
index d06c460a2a..954b160778 100644
--- a/legacy/edje/src/lib/edje_private.h
+++ b/legacy/edje/src/lib/edje_private.h
@@ -126,7 +126,7 @@ void          _edje_var_list_float_append(Edje *ed, int id, double v);
 void          _edje_var_list_float_prepend(Edje *ed, int id, double v);
 void          _edje_var_list_float_insert(Edje *ed, int id, int n, double v);
 
-char         *_edje_var_list_nth_str_get(Edje *ed, int id, int n);
+const char   *_edje_var_list_nth_str_get(Edje *ed, int id, int n);
 void          _edje_var_list_nth_str_set(Edje *ed, int id, int n, char *v);
 void          _edje_var_list_str_append(Edje *ed, int id, char *v);
 void          _edje_var_list_str_prepend(Edje *ed, int id, char *v);
diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index e8ea9fa533..c807ef3b79 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -456,7 +456,6 @@ void
 edje_object_text_change_cb_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, const char *part), void *data)
 {
    Edje *ed;
-   Edje_Real_Part *rp;
 
    ed = _edje_fetch(obj);   
    if (!ed) return;
diff --git a/legacy/edje/src/lib/edje_var.c b/legacy/edje/src/lib/edje_var.c
index 014cc6fddc..3a5ae8d5ff 100644
--- a/legacy/edje/src/lib/edje_var.c
+++ b/legacy/edje/src/lib/edje_var.c
@@ -47,7 +47,6 @@ _edje_var_anim_cb(void *data)
      {
 	Edje *ed;
 	Evas_List *tl2;
-	int delete_me = 0;
 	
 	ed = tl->data;
 	_edje_ref(ed);
@@ -808,21 +807,21 @@ _edje_var_list_float_insert(Edje *ed, int id, int n, double v)
      }
 }
 
-char *
+const char *
 _edje_var_list_nth_str_get(Edje *ed, int id, int n)
 {
-   if (!ed) return 0;
-   if (!ed->var_pool) return 0;
+   if (!ed) return NULL;
+   if (!ed->var_pool) return NULL;
    id -= EDJE_VAR_MAGIC_BASE;
-   if ((id < 0) || (id >= ed->var_pool->size)) return 0;
+   if ((id < 0) || (id >= ed->var_pool->size)) return NULL;
    if (ed->var_pool->vars[id].type == EDJE_VAR_NONE)
      ed->var_pool->vars[id].type = EDJE_VAR_LIST;
-   else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return 0;
+   else if (ed->var_pool->vars[id].type != EDJE_VAR_LIST) return NULL;
      {
 	Edje_Var *var;
 	
 	var = _edje_var_list_nth(ed, id, n);
-	if (!var) return 0;
+	if (!var) return NULL;
 	return _edje_var_var_str_get(ed, var);
      }
 }