diff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c
index 498993db82..ab3affb26c 100644
--- a/iconv/gconv_cache.c
+++ b/iconv/gconv_cache.c
@@ -20,6 +20,7 @@
 
 #include <dlfcn.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
diff --git a/iconv/iconvconfig.c b/iconv/iconvconfig.c
index 1d76c8f1ca..d7a514cf88 100644
--- a/iconv/iconvconfig.c
+++ b/iconv/iconvconfig.c
@@ -968,7 +968,7 @@ write_output (void)
   size_t total;
 
   /* Function to insert the names.  */
-  void name_insert (const void *nodep, VISIT value, int level)
+  static void name_insert (const void *nodep, VISIT value, int level)
     {
       struct name *name;
       unsigned int idx;