diff --git a/legacy/evas/src/lib/data/evas_stringshare.c b/legacy/evas/src/lib/data/evas_stringshare.c
index d0e8ae5769..5679d0f322 100644
--- a/legacy/evas/src/lib/data/evas_stringshare.c
+++ b/legacy/evas/src/lib/data/evas_stringshare.c
@@ -58,6 +58,7 @@ evas_stringshare_add(const char *str)
    char *el_str;
    Evas_Stringshare_El *el, *pel = NULL;
 
+   if (!str) return NULL;
    hash_num = _evas_stringshare_hash_gen(str, &slen);
    for (el = share.buckets[hash_num]; el; pel = el, el = el->next)
      {
@@ -91,6 +92,7 @@ evas_stringshare_del(const char *str)
    char *el_str;
    Evas_Stringshare_El *el, *pel = NULL;
 
+   if (!str) return;
    hash_num = _evas_stringshare_hash_gen(str, &slen);
    for (el = share.buckets[hash_num]; el; pel = el, el = el->next)
      {
diff --git a/legacy/evas/src/lib/include/evas_common.h b/legacy/evas/src/lib/include/evas_common.h
index a61ed6dd80..add6fda73a 100644
--- a/legacy/evas/src/lib/include/evas_common.h
+++ b/legacy/evas/src/lib/include/evas_common.h
@@ -53,6 +53,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <ctype.h>
+#include <stdint.h>
 
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>