diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac
index 58dc11cc7a..bda09ad9ad 100644
--- a/legacy/eina/configure.ac
+++ b/legacy/eina/configure.ac
@@ -390,6 +390,10 @@ fi
 
 AC_SUBST(iconv_libs)
 
+if test "x${have_iconv}" = "xyes" ; then
+   AC_DEFINE([HAVE_ICONV], [1], [Set to 1 if iconv library is installed])
+fi
+
 
 ### Modules
 
diff --git a/legacy/eina/src/lib/eina_log.c b/legacy/eina/src/lib/eina_log.c
index 84dcc6e8a6..68911197c3 100644
--- a/legacy/eina/src/lib/eina_log.c
+++ b/legacy/eina/src/lib/eina_log.c
@@ -1365,7 +1365,9 @@ eina_log_print_cb_file(const Eina_Log_Domain *d, __UNUSED__ Eina_Log_Level level
      }
 #endif
    fprintf(f, "%s %s:%d %s() ", d->name, file, line, fnc);
+#ifdef EFL_HAVE_PTHREAD
  end:
+#endif
    vfprintf(f, fmt, args);
    putc('\n', f);
 }
diff --git a/legacy/eina/src/lib/eina_str.c b/legacy/eina/src/lib/eina_str.c
index f3e9595322..06cd204be8 100644
--- a/legacy/eina/src/lib/eina_str.c
+++ b/legacy/eina/src/lib/eina_str.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <limits.h>
 
-#ifdef HAVE_ICONV_H
+#ifdef HAVE_ICONV
 # include <errno.h>
 # include <iconv.h>
 #endif
@@ -354,10 +354,10 @@ eina_str_join_len(char *dst, size_t size, char sep, const char *a, size_t a_len,
  * @param text     text to convert
  *
  */
+#ifdef HAVE_ICONV
 EAPI char *
 eina_str_convert(const char *enc_from, const char *enc_to, const char *text)
 {
-#ifdef HAVE_ICONV_H
    iconv_t ic;
    char *new_txt, *inp, *outp;
    size_t inb, outb, outlen, tob, outalloc;
@@ -417,10 +417,14 @@ eina_str_convert(const char *enc_from, const char *enc_to, const char *text)
      }
    iconv_close(ic);
    return new_txt;
-#else
-   return NULL;
-#endif
 }
+#else
+EAPI char *
+eina_str_convert(const char *enc_from __UNUSED__, const char *enc_to __UNUSED__, const char *text __UNUSED__)
+{
+   return NULL;
+}
+#endif
 
 /**
  * @brief Put a \ before and Space( ), \ or ' in a string.