diff -r 09af6227574f ed/ed.c
--- a/ed/ed.c	Fri Jun 04 11:44:25 2010 +0100
+++ b/ed/ed.c	Sun Jul 18 17:35:53 2010 +0200
@@ -121,7 +121,7 @@
 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 @@
 		globp = Lr;
 	}
 	zero = malloc((nlall+5)*sizeof(int*));
-	tfname = _mktemp(tmp);
+	tfname = __mktemp(tmp);
 	init();
 	setjmp(savej);
 	commands();
@@ -1584,7 +1584,7 @@
 }
 
 char*
-_mktemp(char *as)
+__mktemp(char *as)
 {
 	char *s;
 	unsigned pid;
diff -r 09af6227574f lib9/_p9dir.c
--- a/lib9/_p9dir.c	Fri Jun 04 11:44:25 2010 +0100
+++ b/lib9/_p9dir.c	Sun Jul 18 17:35:53 2010 +0200
@@ -44,6 +44,7 @@
 #define _HAVESTGEN
 #include <sys/disklabel.h>
 #include <sys/ioctl.h>
+#include <sys/dkio.h>
 static vlong
 disksize(int fd, struct stat *st)
 {