diff --git a/sys/man/2/9p b/sys/man/2/9p
index 3a42b4cfd..036428a2b 100644
--- a/sys/man/2/9p
+++ b/sys/man/2/9p
@@ -66,7 +66,7 @@ typedef struct Srv {
 .nf
 .ft L
 .ta \w'\fLvoid* 'u
-int	srv(Srv *s)
+void	srv(Srv *s)
 void	postmountsrv(Srv *s, char *name, char *mtpt, int flag)
 void	postsharesrv(Srv *s, char *name, char *mtpt, char *desc)
 void	threadpostmountsrv(Srv *s, char *name, char *mtpt, int flag)
diff --git a/sys/man/2/auth b/sys/man/2/auth
index e518a99c7..739d5b965 100644
--- a/sys/man/2/auth
+++ b/sys/man/2/auth
@@ -47,7 +47,7 @@ uint		auth_rpc(AuthRpc *rpc, char *verb, void *a, int n);
 int		auth_getkey(char *params);
 .PP
 .B
-int		(*amount_getkey)(char*, char*);
+int		(*amount_getkey)(char*);
 .PP
 .B
 void		auth_freeAI(AuthInfo *ai);
diff --git a/sys/man/2/cputime b/sys/man/2/cputime
index 8d6413f42..4d6440116 100644
--- a/sys/man/2/cputime
+++ b/sys/man/2/cputime
@@ -8,7 +8,7 @@ cputime, times, cycles \- cpu time in this process and children
 .PP
 .ta \w'\fLdouble 'u
 .B
-int	times(long t[4])
+long	times(long t[4])
 .PP
 .B
 double	cputime(void)
diff --git a/sys/man/2/draw b/sys/man/2/draw
index f517bc5c1..1c0ab2cac 100644
--- a/sys/man/2/draw
+++ b/sys/man/2/draw
@@ -147,9 +147,9 @@ void	fillarc(Image *dst, Point c, int a, int b, Image *src,
 void	fillarcop(Image *dst, Point c, int a, int b, Image *src,
 		Point sp, int alpha, int phi, Drawop op)
 .PB
-int	icossin(int deg, int *cosp, int *sinp)
+void	icossin(int deg, int *cosp, int *sinp)
 .PB
-int	icossin2(int x, int y, int *cosp, int *sinp)
+void	icossin2(int x, int y, int *cosp, int *sinp)
 .PB
 void	border(Image *dst, Rectangle r, int i, Image *color, Point sp)
 .PB
diff --git a/sys/man/2/event b/sys/man/2/event
index fc3c08991..b1c8c4ee1 100644
--- a/sys/man/2/event
+++ b/sys/man/2/event
@@ -70,7 +70,7 @@ void	edrawgetrect(Rectangle r, int up)
 int	emenuhit(int but, Mouse *m, Menu *menu)
 .PP
 .B
-int	emoveto(Point p)
+void	emoveto(Point p)
 .PP
 .B
 void	esetcursor(Cursor *c)
diff --git a/sys/man/2/fcall b/sys/man/2/fcall
index 3ad5f6f97..a8a9c8a57 100644
--- a/sys/man/2/fcall
+++ b/sys/man/2/fcall
@@ -31,7 +31,7 @@ int fcallfmt(Fmt*)
 int dirmodefmt(Fmt*)
 .PP
 .B
-int read9pmsg(int fd, uchar *buf, uint nbuf)
+int read9pmsg(int fd, void *buf, uint nbuf)
 .PP
 .B
 int statcheck(uchar *buf, uint nbuf)
diff --git a/sys/man/2/frame b/sys/man/2/frame
index 1ef43dbfe..eecdaf5d1 100644
--- a/sys/man/2/frame
+++ b/sys/man/2/frame
@@ -55,7 +55,7 @@ void  frdrawsel(Frame *f, Point pt0, ulong p0, ulong p1,
 		int highlighted)
 .PP
 .B
-void  frdrawsel0(Frame *f, Point pt0, ulong p0, ulong p1,
+Point  frdrawsel0(Frame *f, Point pt0, ulong p0, ulong p1,
 .B
 		Image *back, Image *text)
 .PP
diff --git a/sys/man/2/ioproc b/sys/man/2/ioproc
index b63bf65f4..4b69bdba8 100644
--- a/sys/man/2/ioproc
+++ b/sys/man/2/ioproc
@@ -33,7 +33,7 @@ int	ioclose(Ioproc *io, int fd);
 long	ioread(Ioproc *io, int fd, void *a, long n);
 long	ioreadn(Ioproc *io, int fd, void *a, long n);
 long	iowrite(Ioproc *io, int fd, void *a, long n);
-int	iodial(Ioproc *io, char *addr, char *local, char *dir, char *cdfp);
+int	iodial(Ioproc *io, char *addr, char *local, char *dir, int *cdfp);
 int	iosleep(Ioproc *io, long n);
 .XX
 int	ioflush(Ioproc *io);
diff --git a/sys/man/2/ip b/sys/man/2/ip
index d2fcab0dd..b78ea2bfd 100644
--- a/sys/man/2/ip
+++ b/sys/man/2/ip
@@ -51,7 +51,7 @@ int	isv4(uchar *ipaddr)
 void	v4tov6(uchar *ipv6, uchar *ipv4)
 .PP
 .B
-void	v6tov4(uchar *ipv4, uchar *ipv6)
+int	v6tov4(uchar *ipv4, uchar *ipv6)
 .PP
 .B
 ushort	nhgets(void *p)
diff --git a/sys/man/2/memlayer b/sys/man/2/memlayer
index 713218a68..194ecf268 100644
--- a/sys/man/2/memlayer
+++ b/sys/man/2/memlayer
@@ -51,16 +51,16 @@ Memimage*	memlalloc(Memscreen *s, Rectangle r, Refreshfn fn, void *arg, ulong co
 int	memlsetrefresh(Memimage *i, Refreshfn fn, void *arg)
 .PP
 .B
-int	memldelete(Memimage *i)
+void	memldelete(Memimage *i)
 .PP
 .B
-int	memlfree(Memimage *i)
+void	memlfree(Memimage *i)
 .PP
 .B
-int	memlexpose(Memimage *i, Rectangle r)
+void	memlexpose(Memimage *i, Rectangle r)
 .PP
 .B
-int	memlhide(Memimage *i, Rectangle r)
+void	memlhide(Memimage *i, Rectangle r)
 .PP
 .B 
 void	memltofront(Memimage *i)
diff --git a/sys/man/2/plumb b/sys/man/2/plumb
index 1879656f3..166755104 100644
--- a/sys/man/2/plumb
+++ b/sys/man/2/plumb
@@ -47,7 +47,7 @@ char*	plumblookup(Plumbattr *a, char *name)
 Plumbattr*	plumbaddattr(Plumbattr *a, Plumbattr *new)
 .PP
 .B
-Plumbattr*	plumbdelattr(Plumbattra *a, char *name)
+Plumbattr*	plumbdelattr(Plumbattr *a, char *name)
 .PP
 .B
 int	eplumb(int key, char *port)
diff --git a/sys/man/2/pool b/sys/man/2/pool
index b637e3d7c..1360484e9 100644
--- a/sys/man/2/pool
+++ b/sys/man/2/pool
@@ -31,7 +31,7 @@ int	poolisoverlap(Pool* pool, void* ptr, ulong len)
 void*	poolrealloc(Pool* pool, void* ptr, ulong size)
 .PP
 .B
-void	poolcompact(Pool* pool)
+int	poolcompact(Pool* pool)
 .PP
 .B
 void	poolcheck(Pool *pool)
diff --git a/sys/man/2/print b/sys/man/2/print
index b88af0356..c5fa98c71 100644
--- a/sys/man/2/print
+++ b/sys/man/2/print
@@ -56,7 +56,7 @@ int	runevsnprint(Rune *s, int len, char *format, va_list v)
 Rune*	runevseprint(Rune *s, Rune *e, char *format, va_list v)
 .PP
 .B
-Rune*	runevsmprint(Rune *format, va_list v)
+Rune*	runevsmprint(char *format, va_list v)
 .PP
 .B
 .SH DESCRIPTION
diff --git a/sys/man/2/strcat b/sys/man/2/strcat
index 619243a43..06f0bc7b8 100644
--- a/sys/man/2/strcat
+++ b/sys/man/2/strcat
@@ -23,7 +23,7 @@ int	strncmp(char *s1, char *s2, long n)
 int	cistrcmp(char *s1, char *s2)
 .PP
 .B
-int	cistrncmp(char *s1, char *s2, long n)
+int	cistrncmp(char *s1, char *s2, int n)
 .PP
 .B
 char*	strcpy(char *s1, char *s2)
diff --git a/sys/man/2/symbol b/sys/man/2/symbol
index 9e24d716b..7a0601f0b 100644
--- a/sys/man/2/symbol
+++ b/sys/man/2/symbol
@@ -29,7 +29,7 @@ int  fileelem(Sym **fp, uchar *encname, char *buf, int n)
 int  filesym(int index, char *buf, int n)
 .PP
 .B
-long pc2sp(uvlong pc)
+uvlong pc2sp(uvlong pc)
 .PP
 .B
 long pc2line(uvlong pc)
@@ -38,7 +38,7 @@ long pc2line(uvlong pc)
 void textseg(uvlong base, Fhdr *fp)
 .PP
 .B
-uvlong line2addr(ulong line, uvlong basepc, uvlong endpc)
+uvlong line2addr(long line, uvlong basepc, uvlong endpc)
 .PP
 .B
 int  lookup(char *fn, char *var, Symbol *s)
@@ -62,10 +62,10 @@ int  globalsym(Symbol *s, int index)
 int  textsym(Symbol *s, int index)
 .PP
 .B
-uvlong file2pc(char *file, ulong line)
+uvlong file2pc(char *file, long line)
 .PP
 .B
-int  fileline(char *str, int n, uvlong addr)
+long  fileline(char *str, int n, uvlong addr)
 .PP
 .B
 int  fnbound(uvlong addr, uvlong *bounds)
diff --git a/sys/man/2/ttf b/sys/man/2/ttf
index fd361534c..c6d3133eb 100644
--- a/sys/man/2/ttf
+++ b/sys/man/2/ttf
@@ -46,7 +46,7 @@ int	ttfgetcontour(TTGlyph *g, int idx, float **fp, int *nfp);
 TTBitmap*	ttfrender(TTFont *f, char *s, char *e, int w, int h,
 			int flags, char **pp);
 TTBitmap*	ttfrunerender(TTFont *f, Rune *s, Rune *e, int w, int h,
-			int flags, char **pp);
+			int flags, Rune **pp);
 .PB
 TTBitmap*	ttfnewbitmap(int w, int h);
 void	ttfblit(TTBitmap *dst, int dstx, int dsty, TTBitmap *src,
diff --git a/sys/man/2/window b/sys/man/2/window
index 95a6e1d3c..a40d9f5f9 100644
--- a/sys/man/2/window
+++ b/sys/man/2/window
@@ -33,7 +33,7 @@ Screen*	publicscreen(Display *d, int id, ulong chan)
 int	freescreen(Screen *s)
 .PP
 .B
-Image*	allocwindow(Screen *s, Rectangle r, int ref, int col)
+Image*	allocwindow(Screen *s, Rectangle r, int ref, ulong col)
 .PP
 .B
 void	bottomwindow(Image *w)