5 files changed, 24 insertions, 5 deletions
diff --git a/appl/lib/mpeg.b b/appl/lib/mpeg.b
index 100a8708..ed093edc 100644
--- a/appl/lib/mpeg.b
+++ b/appl/lib/mpeg.b
@@ -2,12 +2,13 @@ implement Mpeg;
 
 include "sys.m";
 sys: Sys;
-FD, Connection: import Sys;
+FD: import Sys;
 include "draw.m";
 draw: Draw;
 Display, Rect, Image: import draw;
 include "dial.m";
 dial: Dial;
+Connection: import dial;
 include "mpeg.m";
 
 Chroma: con 16r05;
diff --git a/appl/lib/newns.b b/appl/lib/newns.b
index 534621a8..6a53cb75 100644
--- a/appl/lib/newns.b
+++ b/appl/lib/newns.b
@@ -15,7 +15,7 @@ implement Newns;
 #
 include "sys.m";
 	sys: Sys;
-	FD, FileIO, Connection: import Sys;
+	FD, FileIO: import Sys;
 	stderr: ref FD;
 
 include "draw.m";
@@ -26,6 +26,7 @@ include "bufio.m";
 
 include "dial.m";
 	dial: Dial;
+	Connection: import dial;
 
 include "newns.m";
 
diff --git a/appl/lib/ninep.b b/appl/lib/ninep.b
index 91467f0b..90536d0b 100644
--- a/appl/lib/ninep.b
+++ b/appl/lib/ninep.b
@@ -847,6 +847,21 @@ Rmsg.read(fd: ref Sys->FD, msglim: int): ref Rmsg
 	return m;
 }
 
+Rmsg.write(m: self ref Rmsg, fd: ref Sys->FD, msize: int): int
+{
+	if(msize == 0)
+		m = ref Rmsg.Error(m.tag, "Tversion not seen");
+	d := m.pack();
+	if(msize != 0 && len d > msize){
+		m = ref Rmsg.Error(m.tag, "9P reply didn't fit");
+		d = m.pack();
+	}
+	n := len d;
+	if(sys->write(fd, d, n) != n)
+		return -1;
+	return 0;
+}
+
 dir2text(d: Sys->Dir): string
 {
 	return sys->sprint("Dir(\"%s\",\"%s\",\"%s\",%s,8r%uo,%d,%d,%bd,16r%ux,%d)",
diff --git a/appl/lib/pop3.b b/appl/lib/pop3.b
index ce297004..7cb749f3 100644
--- a/appl/lib/pop3.b
+++ b/appl/lib/pop3.b
@@ -9,8 +9,9 @@ include "dial.m";
 	dial: Dial;
 include "pop3.m";
 
-FD, Connection: import sys;
+FD: import sys;
 Iobuf : import bufio;
+Connection: import dial;
 
 ibuf, obuf : ref Bufio->Iobuf;
 conn : int = 0;
diff --git a/appl/lib/smtp.b b/appl/lib/smtp.b
index 8e118a31..13be21fa 100644
--- a/appl/lib/smtp.b
+++ b/appl/lib/smtp.b
@@ -8,8 +8,9 @@ include "dial.m";
 	dial: Dial;
 include "smtp.m";
 
-FD, Connection: import sys;
-Iobuf : import bufio;
+FD: import sys;
+Iobuf: import bufio;
+Connection: import dial;
 
 ibuf, obuf : ref Bufio->Iobuf;
 conn : int = 0;