diff --git a/src/libplumb/fid.c b/src/libplumb/fid.c
index 86093c05..f19b76ed 100644
--- a/src/libplumb/fid.c
+++ b/src/libplumb/fid.c
@@ -1,12 +1,12 @@
 #include <u.h>
 #include <libc.h>
 #include <fcall.h>
-#include <fs.h>
+#include <9pclient.h>
 #include "plumb.h"
 
-static Fsys *fsplumb;
+static CFsys *fsplumb;
 static int pfd = -1;
-static Fid *pfid;
+static CFid *pfid;
 
 int
 plumbopen(char *name, int omode)
@@ -46,7 +46,7 @@ plumbopen(char *name, int omode)
 	return fsopenfd(fsplumb, name, omode);
 }
 
-Fid*
+CFid*
 plumbopenfid(char *name, int mode)
 {
 	if(fsplumb == nil)
@@ -57,7 +57,7 @@ plumbopenfid(char *name, int mode)
 }
 
 int
-plumbsendtofid(Fid *fid, Plumbmsg *m)
+plumbsendtofid(CFid *fid, Plumbmsg *m)
 {
 	char *buf;
 	int n;
@@ -116,7 +116,7 @@ plumbrecv(int fd)
 }
 
 Plumbmsg*
-plumbrecvfid(Fid *fid)
+plumbrecvfid(CFid *fid)
 {
 	char *buf;
 	Plumbmsg *m;
diff --git a/src/libplumb/mesg.c b/src/libplumb/mesg.c
index 76556293..c9379307 100755
--- a/src/libplumb/mesg.c
+++ b/src/libplumb/mesg.c
@@ -1,7 +1,6 @@
 #include <u.h>
 #include <libc.h>
 #include <fcall.h>
-#include <fs.h>
 #include "plumb.h"
 
 static char attrbuf[4096];