diff --git a/ed/ed.c b/ed/ed.c
index 932d939..85eb455 100644
--- a/ed/ed.c
+++ b/ed/ed.c
@@ -121,7 +121,7 @@ void	setnoaddr(void);
 void	setwide(void);
 void	squeeze(int);
 void	substitute(int);
-char*	_mktemp(char *as);
+char*	__mktemp(char *as);
 
 Rune La[] = { 'a', 0 };
 Rune Lr[] = { 'r', 0 };
@@ -162,7 +162,7 @@ main(int argc, char *argv[])
 		globp = Lr;
 	}
 	zero = malloc((nlall+5)*sizeof(int*));
-	tfname = _mktemp(tmp);
+	tfname = __mktemp(tmp);
 	init();
 	setjmp(savej);
 	commands();
@@ -1584,7 +1584,7 @@ putchr(int ac)
 }
 
 char*
-_mktemp(char *as)
+__mktemp(char *as)
 {
 	char *s;
 	unsigned pid;
diff --git a/lib9/_p9dir.c b/lib9/_p9dir.c
index afda0c5..171240c 100644
--- a/lib9/_p9dir.c
+++ b/lib9/_p9dir.c
@@ -44,6 +44,7 @@ disksize(int fd, struct stat *st)
 #define _HAVESTGEN
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
+#include <sys/dkio.h>
 static vlong
 disksize(int fd, struct stat *st)
 {