diff --git a/sys/src/lib9p/auth.c b/sys/src/lib9p/auth.c
index dcd2d8de0..d9903f7ed 100644
--- a/sys/src/lib9p/auth.c
+++ b/sys/src/lib9p/auth.c
@@ -1,9 +1,9 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include <thread.h>
 #include <9p.h>
+#include <auth.h>
 
 typedef struct Afid Afid;
 
diff --git a/sys/src/lib9p/dirread.c b/sys/src/lib9p/dirread.c
index 7fb883050..aaaa141a1 100644
--- a/sys/src/lib9p/dirread.c
+++ b/sys/src/lib9p/dirread.c
@@ -1,6 +1,5 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include <thread.h>
 #include <9p.h>
diff --git a/sys/src/lib9p/fid.c b/sys/src/lib9p/fid.c
index e0b6af5ee..7bc25d88a 100644
--- a/sys/src/lib9p/fid.c
+++ b/sys/src/lib9p/fid.c
@@ -1,9 +1,8 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include <thread.h>
-#include "9p.h"
+#include <9p.h>
 
 static void
 incfidref(void *v)
diff --git a/sys/src/lib9p/file.c b/sys/src/lib9p/file.c
index eddef7e4c..96fe98c18 100644
--- a/sys/src/lib9p/file.c
+++ b/sys/src/lib9p/file.c
@@ -1,6 +1,5 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include <thread.h>
 #include <9p.h>
diff --git a/sys/src/lib9p/ftest.c b/sys/src/lib9p/ftest.c
index 6692b7f16..d65e2de0b 100644
--- a/sys/src/lib9p/ftest.c
+++ b/sys/src/lib9p/ftest.c
@@ -1,6 +1,5 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include "9p.h"
 
diff --git a/sys/src/lib9p/intmap.c b/sys/src/lib9p/intmap.c
index 40e886e8b..2c25e0af0 100644
--- a/sys/src/lib9p/intmap.c
+++ b/sys/src/lib9p/intmap.c
@@ -1,6 +1,5 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include <thread.h>
 #include <9p.h>
diff --git a/sys/src/lib9p/listen.c b/sys/src/lib9p/listen.c
index 59082f594..c7e8dd02c 100644
--- a/sys/src/lib9p/listen.c
+++ b/sys/src/lib9p/listen.c
@@ -1,6 +1,5 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include <thread.h>
 #include <9p.h>
diff --git a/sys/src/lib9p/mem.c b/sys/src/lib9p/mem.c
index a19a4c9e3..ef7c0515f 100644
--- a/sys/src/lib9p/mem.c
+++ b/sys/src/lib9p/mem.c
@@ -1,9 +1,8 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include <thread.h>
-#include "9p.h"
+#include <9p.h>
 
 void*
 emalloc9p(ulong sz)
diff --git a/sys/src/lib9p/post.c b/sys/src/lib9p/post.c
index 803d7646d..18ded63ba 100644
--- a/sys/src/lib9p/post.c
+++ b/sys/src/lib9p/post.c
@@ -3,7 +3,6 @@
 #include <fcall.h>
 #include <thread.h>
 #include <9p.h>
-#include <auth.h>
 
 static void
 postproc(void *v)
diff --git a/sys/src/lib9p/ramfs.c b/sys/src/lib9p/ramfs.c
index 10e9b98be..06adc5326 100644
--- a/sys/src/lib9p/ramfs.c
+++ b/sys/src/lib9p/ramfs.c
@@ -1,6 +1,5 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include <thread.h>
 #include <9p.h>
diff --git a/sys/src/lib9p/req.c b/sys/src/lib9p/req.c
index 907db0001..b1b8d0897 100644
--- a/sys/src/lib9p/req.c
+++ b/sys/src/lib9p/req.c
@@ -1,6 +1,5 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include <thread.h>
 #include <9p.h>
diff --git a/sys/src/lib9p/share.c b/sys/src/lib9p/share.c
index f33d62b1e..ff73e9c3e 100644
--- a/sys/src/lib9p/share.c
+++ b/sys/src/lib9p/share.c
@@ -3,7 +3,6 @@
 #include <fcall.h>
 #include <thread.h>
 #include <9p.h>
-#include <auth.h>
 
 void
 postsharesrv(Srv *s, char *name, char *mtpt, char *desc)
diff --git a/sys/src/lib9p/srv.c b/sys/src/lib9p/srv.c
index 5e82b5603..63475ab66 100644
--- a/sys/src/lib9p/srv.c
+++ b/sys/src/lib9p/srv.c
@@ -1,6 +1,5 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include <thread.h>
 #include <9p.h>
diff --git a/sys/src/lib9p/uid.c b/sys/src/lib9p/uid.c
index 4b7ee64eb..5afdcfa44 100644
--- a/sys/src/lib9p/uid.c
+++ b/sys/src/lib9p/uid.c
@@ -1,6 +1,5 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include <thread.h>
 #include <9p.h>
diff --git a/sys/src/lib9p/util.c b/sys/src/lib9p/util.c
index 17588a95e..90c6e6120 100644
--- a/sys/src/lib9p/util.c
+++ b/sys/src/lib9p/util.c
@@ -1,9 +1,8 @@
 #include <u.h>
 #include <libc.h>
-#include <auth.h>
 #include <fcall.h>
 #include <thread.h>
-#include "9p.h"
+#include <9p.h>
 
 void
 readbuf(Req *r, void *s, long n)