diff --git a/src/bin/edje/epp/cpplib.c b/src/bin/edje/epp/cpplib.c
index ff211de8b4..a9e8942171 100644
--- a/src/bin/edje/epp/cpplib.c
+++ b/src/bin/edje/epp/cpplib.c
@@ -4151,7 +4151,7 @@ do_xifdef(cpp_reader * pfile, struct directive *keyword,
    int                 c;
 
    /* Detect a #ifndef at start of file (not counting comments).  */
-   if (ip->fname != 0 && keyword->type == T_IFNDEF)
+   if (ip->fname != NULL && keyword->type == T_IFNDEF)
       start_of_file = pfile->only_seen_white == 2;
 
    pfile->no_macro_expand++;
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 0ecc9157ad..70294fd824 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -14896,7 +14896,7 @@ _edje_generate_source_state_text(Edje *ed, Edje_Part_Description_Common *pd,
         source = (txt->text.id_source == -1) ? EINA_FALSE : EINA_TRUE;
         text_source = (txt->text.id_text_source == -1) ? EINA_FALSE : EINA_TRUE;
         ellipsis = EQ(txt->text.ellipsis, ZERO) ? EINA_FALSE : EINA_TRUE;
-        style = (edje_string_id_get(&txt->text.style) == 0) ? EINA_FALSE : EINA_TRUE;
+        style = (edje_string_id_get(&txt->text.style) == NULL) ? EINA_FALSE : EINA_TRUE;
         color_3 = ((txt->text.color3.r == 0) && (txt->text.color3.g == 0) &&
                    (txt->text.color3.b == 0) && (txt->text.color3.a == 128)) ? EINA_FALSE : EINA_TRUE;
      }