Index: head/lib/libnetbsd/util.h
===================================================================
--- head/lib/libnetbsd/util.h
+++ head/lib/libnetbsd/util.h
@@ -37,6 +37,7 @@
 
 #include <sys/types.h>
 #include <libutil.h>
+#include <stdio.h>
 
 void	(*esetfunc(void (*)(int, const char *, ...)))(int, const char *, ...);
 size_t	 estrlcpy(char *, const char *, size_t);
@@ -46,7 +47,7 @@
 void	*emalloc(size_t);
 void	*ecalloc(size_t, size_t);
 void	*erealloc(void *, size_t);
-struct __sFILE	*efopen(const char *, const char *);
+FILE	*efopen(const char *, const char *);
 int	 easprintf(char ** __restrict, const char * __restrict, ...)
 	    __printflike(2, 3);
 int	 evasprintf(char ** __restrict, const char * __restrict, __va_list)