Index: include/curpak.h
===================================================================
--- include/curpak.h	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ include/curpak.h	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -20,18 +20,18 @@
 struct curpak {
 
-	short		(*curtype)();
-	short		(*premove)();
-	short		(*pstmove)();
-	short		(*cx_key)();
-	short		(*cy_key)();
-	short		(*cx_upd)();
-	short		(*cy_upd)();
-	short		(*xy_up)();
-	short		(*xy_dn)();
-	short		(*x_key)();
-	short		(*e_key)();
-	short		(*m_key)();
-	short		(*d_key)();
-	short		(*not_fld)();
+	short		(*curtype)(void);
+	void		(*premove)(void);
+	void		(*pstmove)(void);
+	void		(*cx_key)(void);
+	void		(*cy_key)(void);
+	void		(*cx_upd)(void);
+	void		(*cy_upd)(void);
+	void		(*xy_up)(void);
+	void		(*xy_dn)(void);
+	void		(*x_key)(void);
+	void		(*e_key)(void);
+	void		(*m_key)(void);
+	void		(*d_key)(void);
+	void		(*not_fld)(short k);
 	struct fet	*curfet;
 	struct selbox	*csbp;
Index: include/fields.h
===================================================================
--- include/fields.h	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ include/fields.h	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -14,8 +14,12 @@
 	short	frcol;		/* rightmost column of field */
 	short	ftags;		/* field tags / parameters (used variously) */
-	short	(*ebto)();	/* edit buffer 'to' (setup) function */
-	short	(*ebfrom)();	/* edit buffer 'from' (parse) function */
-	short	(*redisp)();	/* field (re)display function */
-	short	(*datain)();	/* data entry function */
+	void	(*ebto)(short ftags);
+				/* edit buffer 'to' (setup) function */
+	void	(*ebfrom)(short ftags);
+				/* edit buffer 'from' (parse) function */
+	void	(*redisp)(short ftags);
+				/* field (re)display function */
+	void	(*datain)(short ftags, short asig);
+				/* data entry function */
 };
 
@@ -27,5 +31,6 @@
 	short	sbymax;		/* maximum y - bottom edge of box */
 	short	sbarg;		/* select box argument */
-	short	(*boxhit)();	/* box-hit function */
+	void	(*boxhit)(short sbarg);
+				/* box-hit function */
 };
 
Index: libcio/blkrd.c
===================================================================
--- libcio/blkrd.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ libcio/blkrd.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -44,5 +44,5 @@
 extern	long	_berrno;		/* last file system bios error number */
 
-extern	short	_thefat[];		/* current file allocation table */
+extern	unsigned	_thefat[];		/* current file allocation table */
 
 extern	struct	bpb	*_thebpb;	/* current bios parameter block */
Index: libcio/blkwr.c
===================================================================
--- libcio/blkwr.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ libcio/blkwr.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -32,7 +32,7 @@
 extern	struct	bpb	*_thebpb;	/* current bios parameter block */
 
-extern	short	_thefat[];		/* current file allocation table */
-
-extern	short	_fatmod;		/* FAT modified flag */
+extern	unsigned	_thefat[];		/* current file allocation table */
+
+extern	int	_fatmod;		/* FAT modified flag */
 
 #if DEBUGIT
Index: libcio/clusmap.c
===================================================================
--- libcio/clusmap.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ libcio/clusmap.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -17,5 +17,5 @@
 
 extern	struct	bpb	*_thebpb;
-extern	short	_thefat[];
+extern	unsigned	_thefat[];
 
 extern	int	_filecl(struct fcb *fp);
Index: libcio/write.c
===================================================================
--- libcio/write.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ libcio/write.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -28,5 +28,5 @@
 extern	char	*memset(char *sp, char c, int n);
 
-extern	short	_fatmod;
+extern	int	_fatmod;
 
 extern	unsigned	_thefat[];
Index: ram/adselbx.c
===================================================================
--- ram/adselbx.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/adselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -33,6 +33,6 @@
 extern	void	adpoint(short x, short y, short pen);
 
-extern	short	(*itxput)();
-extern	short	(*point)();
+extern	void	(*itxput)(short row, short col, char *txt, short tag);
+extern	void	(*point)(short x, short y, short pen);
 
 extern	short	admctl;
@@ -70,5 +70,5 @@
 
 short	bx_null(void);
-short	adfnbox(short n);
+void	adfnbox(short n);
 
 /* 
@@ -207,5 +207,5 @@
 */
 
-short adfnbox(short n)
+void adfnbox(short n)
 {
 	register short i, grp, key, line;
@@ -242,9 +242,10 @@
 				}
 
-				return(SUCCESS);
+				return;
 
 			} else {				/* table */
 
-				return(enterit());	/* data entry */
+				enterit();	/* data entry */
+				return;
 			}
 		}
@@ -302,5 +303,5 @@
 		}
 
-		return(SUCCESS);
+		return;
 /* 
 
@@ -315,5 +316,5 @@
 			putasg(curasg);
 			adswin(0);
-			return(SUCCESS);
+			return;
 
 		} else if ((col GE 6) AND (col LE 10)) {	/* retrieve */
@@ -321,5 +322,5 @@
 			getasg(curasg);
 			awins();
-			return(SUCCESS);
+			return;
 		}
 
@@ -329,5 +330,5 @@
 
 			if ((row LT 5) OR (row GT 8))
-				return(FAILURE);
+				return;
 
 			mctlnum[row - 5] ^= GTAG1;
@@ -344,9 +345,10 @@
 				row, adbox[n][7], bfs, 14);
 
-			return(SUCCESS);
+			return;
 
 		} else {
 
-			return(enterit());
+			enterit();
+			return;
 		}
 /* 
@@ -365,10 +367,10 @@
 				admenu(-1);	/* take down menu */
 
-			return(SUCCESS);
+			return;
 
 		} else if (col EQ 39) {	/* groups 1..6 */
 
 			if ((row LT 4) OR (row GT 9))
-				return(FAILURE);
+				return;
 
 			/* toggle "legato" mode */
@@ -388,5 +390,5 @@
 			       row, col, bfs, 14);
 
-			return(SUCCESS);
+			return;
 /* 
 
@@ -413,9 +415,10 @@
 			       row, col, bfs, 14);
 
-			return(SUCCESS);
+			return;
 
 		} else {
 
-			return(enterit());	/* data entry */
+			enterit();	/* data entry */
+			return;
 		}
 /* 
@@ -425,5 +428,5 @@
 
 		if (admctl NE -1)
-			return(FAILURE);
+			return;
 
 		if (asghit) {
@@ -443,5 +446,5 @@
 
 				if (key-- EQ 0)
-					return(FAILURE);
+					return;
 
 				if (key LT asgfks) {
@@ -484,5 +487,5 @@
 
 				asghit = 0;
-				return(FAILURE);
+				return;
 			}
 
@@ -498,5 +501,5 @@
 
 				asghit = 0;
-				return(FAILURE);
+				return;
 			}
 
@@ -509,5 +512,5 @@
 		}
 
-		return(SUCCESS);
+		return;
 
 	case 8:			/* aux ctl */
@@ -515,5 +518,5 @@
 		setaux(NOT auxctl);
 		adswin(8);
-		return(SUCCESS);
+		return;
 
 	case 9:			/* tuning menu */
@@ -526,12 +529,12 @@
 				admenu(-1);	/* take down menu */
 
-			return(SUCCESS);
+			return;
 
 		} else {
 
-			return(enterit());	/* data entry */
+			enterit();	/* data entry */
+			return;
 		}
 	}
-
-	return(FAILURE);
 }
+
Index: ram/asgdsp.c
===================================================================
--- ram/asgdsp.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/asgdsp.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -60,5 +60,5 @@
 /* things defined elsewhere */
 
-extern	int		(*point)();
+extern	void		(*point)(short x, short y, short pen);
 extern	unsigned	exp_c(unsigned c);
 
Index: ram/curset.c
===================================================================
--- ram/curset.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/curset.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -38,19 +38,19 @@
 extern	void	cmvgen(void);
 
-extern	short		(*curmove)();
-extern	short		(*curtype)();
-extern	short		(*cx_key)();
-extern	short		(*cx_upd)();
-extern	short		(*cy_key)();
-extern	short		(*cy_upd)();
-extern	short		(*d_key)();
-extern	short		(*e_key)();
-extern	short		(*m_key)();
-extern	short		(*not_fld)();
-extern	short		(*premove)();
-extern	short		(*pstmove)();
-extern	short		(*x_key)();
-extern	short		(*xy_dn)();
-extern	short		(*xy_up)();
+extern	void		(*curmove)(void);
+extern	short		(*curtype)(void);
+extern	void		(*cx_key)(void);
+extern	void		(*cx_upd)(void);
+extern	void		(*cy_key)(void);
+extern	void		(*cy_upd)(void);
+extern	void		(*d_key)(void);
+extern	void		(*e_key)(void);
+extern	void		(*m_key)(void);
+extern	void		(*not_fld)(short k);
+extern	void		(*premove)(void);
+extern	void		(*pstmove)(void);
+extern	void		(*x_key)(void);
+extern	void		(*xy_dn)(void);
+extern	void		(*xy_up)(void);
 
 extern	short		*cratex;
Index: ram/enterit.c
===================================================================
--- ram/enterit.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/enterit.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -36,8 +36,18 @@
 #endif
 
-extern	short	(*cx_key)(), (*cy_key)(), (*cx_upd)(), (*cy_upd)();
-extern	short	(*xy_up)(), (*xy_dn)(), (*not_fld)();
-extern	short	(*x_key)(), (*e_key)(), (*m_key)(), (*d_key)();
-extern	short	(*premove)(), (*pstmove)(), (*curtype)();
+extern	void	(*cx_key)(void);
+extern	void	(*cy_key)(void);
+extern	void	(*cx_upd)(void);
+extern	void	(*cy_upd)(void);
+extern	void	(*xy_up)(void);
+extern	void	(*xy_dn)(void);
+extern	void	(*not_fld)(short k);
+extern	void	(*x_key)(void);
+extern	void	(*e_key)(void);
+extern	void	(*m_key)(void);
+extern	void	(*d_key)(void);
+extern	void	(*premove)(void);
+extern	void	(*pstmove)(void);
+extern	short	(*curtype)(void);
 
 extern	short	*cratex;
Index: ram/etadyn.c
===================================================================
--- ram/etadyn.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/etadyn.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -34,5 +34,5 @@
 extern	short		dyntab[];
 
-extern	unsigned	expbit[];
+extern	short		expbit[];
 
 extern	short		adbox[][8];
Index: ram/etatab.c
===================================================================
--- ram/etatab.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/etatab.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -18,5 +18,5 @@
 extern	void	adpoint(short x, short y, short pen);
 
-extern	short	(*point)();
+extern	void	(*point)(short x, short y, short pen);
 
 extern	unsigned	*asgob;
Index: ram/etloc.c
===================================================================
--- ram/etloc.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/etloc.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -37,5 +37,5 @@
 extern	short		vce2grp[];
 
-extern	unsigned	expbit[];
+extern	short		expbit[];
 
 extern	struct gdsel	*gdstbc[];
Index: ram/idfield.c
===================================================================
--- ram/idfield.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/idfield.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -99,5 +99,5 @@
 extern	short	vtxval, vtyval;
 
-extern	unsigned	temax, temin;
+extern	short	temax, temin;
 
 extern	short	*cratex, *cratey, crate0[], crate1[];
Index: ram/idselbx.c
===================================================================
--- ram/idselbx.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/idselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -15,5 +15,5 @@
 #include "instdsp.h"
 
-extern	short	(*itxput)();
+extern	void	(*itxput)(short row, short col, char *txt, short tag);
 
 extern	void	lseg(short x1, short y1, short x2, short y2, short t);
@@ -43,5 +43,5 @@
 extern	short	pntsv, pecase, stccol, subj, submenu;
 
-extern	unsigned	temin, temax;
+extern	short	temin, temax;
 
 extern	struct	selbox	*csbp, *curboxp;
@@ -65,5 +65,5 @@
 
 short	bx_null(void);
-short	idfnbox(short n);
+void	idfnbox(short n);
 
 /* 
@@ -435,5 +435,5 @@
 */
 
-short idfnbox(short n)
+void idfnbox(short n)
 {
 	register short col, i, row;
@@ -453,6 +453,8 @@
 		/* handle data entry special case for resonance in filter fn. */
 
-		if ((curfunc EQ 4) AND (row EQ 5) AND (col EQ 62))
-			return(enterit());
+		if ((curfunc EQ 4) AND (row EQ 5) AND (col EQ 62)) {
+			enterit();
+			return;
+		}
 
 		switch (pntsv) {	/* dispatch off of point select state */
@@ -484,5 +486,5 @@
 		}
 
-		return(TRUE);
+		return;
 
 	} else if (hitbox EQ 18) {		/* configuration */
@@ -491,9 +493,10 @@
 
 			wcmenu(0);
-			return(TRUE);
+			return;
 
 		} else {
 
-			return(enterit());
+			enterit();
+			return;
 		}
 /* 
@@ -534,9 +537,10 @@
 			}
 
-			return(SUCCESS);
+			return;
 
 		} else {
 
-			return(enterit());	/* do data entry */
+			enterit();	/* do data entry */
+			return;
 		}
 /* 
@@ -548,9 +552,10 @@
 
 			wcmenu(1);
-			return(TRUE);
+			return;
 
 		} else {
 
-			return(enterit());
+			enterit();
+			return;
 		}
 
@@ -587,5 +592,5 @@
 		}
 
-		return(TRUE);
+		return;
 /* 
 
@@ -617,7 +622,5 @@
 
 		setgc(ICURX, ICURY);		/* put cursor in center */
-		return(TRUE);
+		return;
 	}
-
-	return(FALSE);
-}
+}
Index: ram/im700.c
===================================================================
--- ram/im700.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/im700.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -95,19 +95,19 @@
 extern	PFS	(*swpt)[];		/* switch dispatch table pointer */
 
-extern	short	(*curmove)();		/* cursor move function */
-extern	short	(*curtype)();		/* cursor type function */
-extern	short	(*cx_key)();		/* x rate calculation */
-extern	short	(*cx_upd)();		/* x update */
-extern	short	(*cy_key)();		/* y rate calculation */
-extern	short	(*cy_upd)();		/* y update */
-extern	short	(*d_key)();		/* in-field data key processor */
-extern	short	(*e_key)();		/* E key processor */
-extern	short	(*m_key)();		/* M key processor */
-extern	short	(*not_fld)();		/* not-in-field data key processor */
-extern	short	(*premove)();		/* cursor pre-move function */
-extern	short	(*pstmove)();		/* cursor post-move function */
-extern	short	(*x_key)();		/* X key processor */
-extern	short	(*xy_dn)();		/* cursor - finger on (down) */
-extern	short	(*xy_up)();		/* cursor - finger off (up) */
+extern	void	(*curmove)(void);	/* cursor move function */
+extern	short	(*curtype)(void);	/* cursor type function */
+extern	void	(*cx_key)(void);	/* x rate calculation */
+extern	void	(*cx_upd)(void);	/* x update */
+extern	void	(*cy_key)(void);	/* y rate calculation */
+extern	void	(*cy_upd)(void);	/* y update */
+extern	void	(*d_key)(void);		/* in-field data key processor */
+extern	void	(*e_key)(void);		/* E key processor */
+extern	void	(*m_key)(void);		/* M key processor */
+extern	void	(*not_fld)(short k);	/* not-in-field data key processor */
+extern	void	(*premove)(void);	/* cursor pre-move function */
+extern	void	(*pstmove)(void);	/* cursor post-move function */
+extern	void	(*x_key)(void);		/* X key processor */
+extern	void	(*xy_dn)(void);		/* cursor - finger on (down) */
+extern	void	(*xy_up)(void);		/* cursor - finger off (up) */
 
 extern	short	*cratex;		/* cursor x rate table pointer */
@@ -341,5 +341,5 @@
 short	vtccol;			/* virtual typewriter cursor column */
 short	vtcrow;			/* virtual typewriter cursor row */
-short	vtdechr;		/* virtual typewriter data entry character */
+char	vtdechr;		/* virtual typewriter data entry character */
 short	vtdecol;		/* virtual typewriter data entry column */
 short	vtpcol;			/* virtual typewriter column */
Index: ram/instdsp.c
===================================================================
--- ram/instdsp.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/instdsp.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -29,4 +29,6 @@
 
 /* things defined elsewhere */
+
+extern	void	(*point)(short x, short y, short pen);
 
 extern	void	fpuint(void);
Index: ram/lcdlbls.c
===================================================================
--- ram/lcdlbls.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/lcdlbls.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -53,13 +53,13 @@
 extern	unsigned	setsr(unsigned sr);
 
-extern	short	(*d_key)();
-extern	short	(*e_key)();
-extern	short	(*m_key)();
-extern	short	(*x_key)();
-extern	short	(*olddkey)();
-extern	short	(*oldekey)();
-extern	short	(*oldmkey)();
-extern	short	(*oldxkey)();
-extern	short	(*point)();
+extern	void	(*d_key)(void);
+extern	void	(*e_key)(void);
+extern	void	(*m_key)(void);
+extern	void	(*x_key)(void);
+extern	void	(*olddkey)(void);
+extern	void	(*oldekey)(void);
+extern	void	(*oldmkey)(void);
+extern	void	(*oldxkey)(void);
+extern	void	(*point)(short x, short y, short pen);
 
 extern	PFS	(*oldsw)[];
Index: ram/ldselbx.c
===================================================================
--- ram/ldselbx.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/ldselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -66,5 +66,5 @@
 #endif
 
-extern	short	(*point)();
+extern	void	(*point)(short x, short y, short pen);
 
 extern	short	asmode;
@@ -74,5 +74,5 @@
 extern	short	cyrate;
 extern	short	cyval;
-extern	short	errno;
+extern	int	errno;
 extern	short	gomode;
 extern	short	hitcx;
Index: ram/libdsp.c
===================================================================
--- ram/libdsp.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/libdsp.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -56,4 +56,6 @@
 
 /* things defined elsewhere */
+
+extern	void	(*point)(short x, short y, short pen);
 
 extern	void	vbfill4(unsigned *obj, short obwidth, short xmin, short ymin, short xmax, short ymax, unsigned color);
@@ -297,9 +299,9 @@
 unsigned exp_c(unsigned c)
 {
-	cx &= 0x000F;		/* use low 4 bits as the basis */
-	cx |= cx << 4;		/* turn them into 8 bits */
-	cx |= cx << 8;		/* make it a full 16 bits */
-
-	return(cx);
+	c &= 0x000F;		/* use low 4 bits as the basis */
+	c |= c << 4;		/* turn them into 8 bits */
+	c |= c << 8;		/* make it a full 16 bits */
+
+	return(c);
 }
 
Index: ram/localkb.c
===================================================================
--- ram/localkb.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/localkb.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -31,5 +31,5 @@
 */
 
-extern	short	(*point)();
+extern	void	(*point)(short x, short y, short pen);
 
 extern	short	ancmsw;
Index: ram/m7menu.c
===================================================================
--- ram/m7menu.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/m7menu.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -40,5 +40,5 @@
 extern	struct	selbox	*csbp, *curboxp;
 
-extern	short	(*point)();
+extern	void	(*point)(short x, short y, short pen);
 
 extern	short	nokey(void);
Index: ram/midas.c
===================================================================
--- ram/midas.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/midas.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -30,7 +30,10 @@
 extern	void	pch_ped(short stat);
 
-extern	short	(*foot1)(), (*foot2)(), (*pulse1)(), (*pulse2)();
-
-extern	char	*end, *etext, *edata;
+extern	void	(*foot1)(short stat);
+extern	void	(*foot2)(short stat);
+extern	void	(*pulse1)(void);
+extern	void	(*pulse2)(void);
+
+extern	char	end, etext, edata;
 
 extern	short	clkrun, clksrc, initcfg, ndisp, verbose;
Index: ram/msl.c
===================================================================
--- ram/msl.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/msl.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -56,10 +56,10 @@
 /* variables defined elsewhere */
 
-extern	short	(*cx_key)();
-extern	short	(*cy_key)();
-extern	short	(*d_key)();
-extern	short	(*e_key)();
-extern	short	(*m_key)();
-extern	short	(*x_key)();
+extern	void	(*cx_key)(void);
+extern	void	(*cy_key)(void);
+extern	void	(*d_key)(void);
+extern	void	(*e_key)(void);
+extern	void	(*m_key)(void);
+extern	void	(*x_key)(void);
 
 extern	PFS	(*swpt)[];
@@ -117,5 +117,5 @@
 */
 
-extern	unsigned short	*obj8;
+extern	unsigned	*obj8;
 
 extern	long	afi;
@@ -373,5 +373,5 @@
 				} else if ((asig GE 60) AND (asig LE 69)) {
 
-					(*d_key)(asig - 60);
+					(*d_key)();
 
 /* 
Index: ram/nedacc.c
===================================================================
--- ram/nedacc.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/nedacc.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -744,5 +744,5 @@
 	}
 
-	if (pix2mid(cxval, cyval)) {	/* must point at a note position */
+	if (pix2mid()) {	/* must point at a note position */
 
 #if	DEBUGIT
Index: ram/ptdisp.c
===================================================================
--- ram/ptdisp.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/ptdisp.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -18,9 +18,10 @@
 extern	char	*LineFwd(void);
 
-extern	short	(*BakLine)(), (*FwdLine)();
+extern	char	*(*BakLine)(void);
+extern	char	*(*FwdLine)(void);
 
 extern	unsigned	short	pt_alc(void);
 
-extern	unsigned short	*obj8, *obj9, *obj10, *obj11;
+extern	unsigned	*obj8, *obj9, *obj10, *obj11;
 extern	unsigned short	*LineBuf, *ScObAdr, *OldLine;
 extern	unsigned short	LineAtr;
@@ -32,5 +33,5 @@
 extern	short	cxval;
 
-extern	unsigned short	cg3[];
+extern	int	cg3[][256];
 
 unsigned short	seqflag[16];		/* sequence flags */
Index: ram/ptdkey.c
===================================================================
--- ram/ptdkey.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/ptdkey.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -45,5 +45,5 @@
 extern	short	asig, astat;
 
-extern	short	dpepred, dpecpos, dpesucc;
+extern	unsigned short	dpepred, dpecpos, dpesucc;
 
 extern	short	ptegood, ptedfok, ptestok, ptedsok, ptedtok;
Index: ram/ptfield.c
===================================================================
--- ram/ptfield.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/ptfield.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -31,10 +31,13 @@
 short	usevect = TRUE;
 
-extern	short	(*cx_key)(), (*cy_key)();
+extern	void	(*cx_key)(void);
+extern	void	(*cy_key)(void);
 #endif
 
-extern	short	(*xy_up)(), (*xy_dn)();
-extern	short	(*premove)(), (*pstmove)();
-extern	short	(*curtype)();
+extern	void	(*xy_up)(void);
+extern	void	(*xy_dn)(void);
+extern	void	(*premove)(void);
+extern	void	(*pstmove)(void);
+extern	short	(*curtype)(void);
 
 extern	unsigned	fromfpu(unsigned fputime);
Index: ram/ptread.c
===================================================================
--- ram/ptread.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/ptread.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -30,8 +30,8 @@
 #endif
 
-extern	short	dpecpos;
-extern	short	dpepred;
-extern	short	dpesucc;
-extern	short	errno;
+extern	unsigned short	dpecpos;
+extern	unsigned short	dpepred;
+extern	unsigned short	dpesucc;
+extern	int	errno;
 extern	short	ptecpos;
 extern	short	ptepred;
@@ -446,5 +446,5 @@
 		if (stashp()) {		/* stash the patch */
 
-			nopatch(fp);
+			nopatch();
 			ptecpos = 0;
 			voidpb();
Index: ram/ptselbx.c
===================================================================
--- ram/ptselbx.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/ptselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -66,5 +66,5 @@
 extern	short	ndvals[];
 
-extern	unsigned short	*obj11;
+extern	unsigned	*obj11;
 
 extern	struct selbox	*csbp;
Index: ram/rscript.c
===================================================================
--- ram/rscript.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/rscript.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -8,5 +8,5 @@
 extern	int	sqscan(char *ip);
 
-extern	int	endflg;
+extern	short	endflg;
 
 char	*script0[] = {		/* initialization score selection string */
Index: ram/scordsp.c
===================================================================
--- ram/scordsp.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/scordsp.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -38,5 +38,5 @@
 /* variables defined elsewhere */
 
-extern	short	(*point)();
+extern	void	(*point)(short x, short y, short pen);
 
 extern	unsigned *obj0, *obj2, *obj3, *obj8, *obj11, *obj13, *obj14, *obj15;
@@ -77,5 +77,5 @@
 extern	char	*nedlbl[];		/* note edit labels */
 
-extern	short	kbobj[];		/* keyboard icon */
+extern	int	kbobj[];		/* keyboard icon */
 
 extern	short	grpmode[];		/* group mode - 0 = play, 1 = stdby, 2 = rec */
Index: ram/scread.c
===================================================================
--- ram/scread.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/scread.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -20,5 +20,5 @@
 extern	long	schksum;		/* score checksum */
 
-extern	short	errno;			/* system error number */
+extern	int	errno;			/* system error number */
 extern	short	lderrsw;		/* librarian error message switch */
 extern	short	lrasw;			/* "Content" switch */
Index: ram/scselbx.c
===================================================================
--- ram/scselbx.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/scselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -41,6 +41,6 @@
 /* variables defined elsewhere */
 
-extern	short	(*itxput)();
-extern	short	(*point)();
+extern	void	(*itxput)(short row, short col, char *txt, short tag);
+extern	void	(*point)(short x, short y, short pen);
 
 extern	short	ancmsw;
@@ -116,5 +116,5 @@
 /* forward references */
 
-short	sdboxfn(short n);
+void	sdboxfn(short n);
 void	bspscur(void);
 void	svtdsp(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf);
@@ -1232,5 +1232,5 @@
 */
 
-short sdboxfn(short n)
+void sdboxfn(short n)
 {
 	register short	row, col, grp, what, i;
@@ -1248,5 +1248,5 @@
 
 			if (clkrun)		/* clock can't be running */
-				return(FAILURE);
+				return;
 
 			if (ac_code EQ N_SHARP)
@@ -1256,15 +1256,15 @@
 
 			sc_refr(fc_val);
-			return(SUCCESS);
+			return;
 
 		} else if ((col GE 2) AND (col LE 4)) {	/* section menu */
 
 			if (clkrun)		/* clock can't be running */
-				return(FAILURE);
+				return;
 
 			if (sdmctl EQ -1) {	/* menu not up yet */
 
 				sdmenu(4);	/* put up the menu */
-				return(SUCCESS);
+				return;
 /* 
 
@@ -1278,5 +1278,5 @@
 
 						hilitop(SOP_GO);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 8) AND
@@ -1284,5 +1284,5 @@
 
 						hilitop(SOP_MOV);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 15) AND
@@ -1290,5 +1290,5 @@
 
 						hilitop(SOP_STC);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 24) AND
@@ -1301,5 +1301,5 @@
 						}
 
-						return(SUCCESS);
+						return;
 					}
 /* 
@@ -1312,5 +1312,5 @@
 
 						hilitop(SOP_BGN);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 8) AND
@@ -1318,5 +1318,5 @@
 
 						hilitop(SOP_CPY);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 15) AND
@@ -1324,5 +1324,5 @@
 
 						hilitop(SOP_DGR);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 24) AND
@@ -1335,5 +1335,5 @@
 						}
 
-						return(SUCCESS);
+						return;
 					}
 /* 
@@ -1346,5 +1346,5 @@
 
 						hilitop(SOP_END);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 8) AND
@@ -1352,5 +1352,5 @@
 
 						hilitop(SOP_MRG);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 15) AND
@@ -1358,5 +1358,5 @@
 
 						hilitop(SOP_DEV);
-						return(SUCCESS);
+						return;
 					}
 
@@ -1370,5 +1370,5 @@
 
 						hilitop(SOP_GRP);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 15) AND
@@ -1376,5 +1376,5 @@
 
 						hilitop(SOP_RMV);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 28) AND
@@ -1387,5 +1387,5 @@
 							dsgtmn(gtmsel, TRUE);
 
-						return(SUCCESS);
+						return;
 					}
 
@@ -1397,18 +1397,21 @@
 						secop = SOP_NUL;
 						sdmenu(-1);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 22) AND
 						   (vtccol LE 24)) {	/* Transpose */
 
-						return(enterit());
+						enterit();
+						return;
 					}
 				}
 			}
 
-			return(FAILURE);
-
-		} else
-			return(enterit());
+			return;
+
+		} else {
+			enterit();
+			return;
+		}
 
 /* 
@@ -1428,5 +1431,5 @@
 
 		dsimode();			/* update insert mode display */
-		return(SUCCESS);
+		return;
 
 	case 2:		/* clock control, source */
@@ -1436,5 +1439,5 @@
 			clkset(NOT clkrun);
 			dsclk();
-			return(SUCCESS);
+			return;
 
 /* 
@@ -1446,5 +1449,5 @@
 
 				sdmenu(3);
-				return(SUCCESS);
+				return;
 
 			} else {		/* menu up */
@@ -1458,5 +1461,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return(SUCCESS);
+						return;
 					}
 
@@ -1469,5 +1472,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return(SUCCESS);
+						return;
 					}
 
@@ -1480,10 +1483,10 @@
 						sdmenu(-1);
 						sdwin(2);
-						return(SUCCESS);
+						return;
 					}
 				}
 			}
 
-			return(FAILURE);
+			return;
 /* 
 
@@ -1495,5 +1498,5 @@
 				sdmenu(2);
 				setleds();
-				return(SUCCESS);
+				return;
 
 			} else {		/* menu up */
@@ -1509,5 +1512,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 9) AND
@@ -1519,5 +1522,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 17) AND
@@ -1530,5 +1533,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return(SUCCESS);
+						return;
 					}
 
@@ -1546,5 +1549,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 9) AND
@@ -1556,5 +1559,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return(SUCCESS);
+						return;
 					}
 /* 
@@ -1571,5 +1574,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return(SUCCESS);
+						return;
 
 					} else if ((vtccol GE 9) AND
@@ -1581,5 +1584,5 @@
 						sdmenu(-1);
 						sdwin(2);
-						return(SUCCESS);
+						return;
 					}
 				}
@@ -1587,5 +1590,5 @@
 		}
 
-		return(FAILURE);
+		return;
 
 /* 
@@ -1595,5 +1598,5 @@
 
 		if (clkrun)		/* clock can't be running */
-			return(FAILURE);
+			return;
 
 		if (scmctl NE -1)
@@ -1604,5 +1607,5 @@
 			sdmenu(1);
 			noteop = NOP_NUL;
-			return(SUCCESS);
+			return;
 
 		} else {		/* menu up - select operation */
@@ -1614,5 +1617,5 @@
 
 					hilitnt(NOP_ACC);
-					return(SUCCESS);
+					return;
 
 				} else if ((vtccol GE 13) AND
@@ -1620,5 +1623,5 @@
 
 					hilitnt(NOP_MVN);
-					return(SUCCESS);
+					return;
 
 				} else if ((vtccol GE 25) AND
@@ -1626,9 +1629,9 @@
 
 					hilitnt(NOP_NUL);
-					return(SUCCESS);
+					return;
 
 				}
 
-				return(FAILURE);
+				return;
 /* 
 
@@ -1640,5 +1643,5 @@
 
 					hilitnt(NOP_NAT);
-					return(SUCCESS);
+					return;
 
 				} else if ((vtccol GE 13) AND
@@ -1646,8 +1649,8 @@
 
 					hilitnt(NOP_MVB);
-					return(SUCCESS);
+					return;
 				}
 
-				return(FAILURE);
+				return;
 
 			} else if (vtcrow EQ 21) {
@@ -1657,5 +1660,5 @@
 
 					hilitnt(NOP_END);
-					return(SUCCESS);
+					return;
 
 				} else if ((vtccol GE 13) AND
@@ -1663,14 +1666,14 @@
 
 					hilitnt(NOP_MVE);
-					return(SUCCESS);
+					return;
 				}
 
-				return(FAILURE);
+				return;
 
 			} else
-				return(FAILURE);
-		}
-
-		return(FAILURE);
+				return;
+		}
+
+		return;
 
 /* 
@@ -1700,9 +1703,10 @@
 			}
 
-			return(SUCCESS);
+			return;
 
 		} else {
 
-			return(enterit());	/* data entry */
+			enterit();	/* data entry */
+			return;
 		}
 
@@ -1716,9 +1720,10 @@
 				scmenu(-1);	/* take down menu */
 
-			return(SUCCESS);
+			return;
 
 		} else {
 
-			return(enterit());	/* data entry */
+			enterit();	/* data entry */
+			return;
 		}
 /* 
@@ -1775,5 +1780,5 @@
 		}
 
-		return(SUCCESS);
+		return;
 
 /* 
@@ -1832,5 +1837,5 @@
 		}
 
-		return(SUCCESS);
+		return;
 /* 
 
@@ -1838,5 +1843,5 @@
 	case 10:	/* Output */
 
-		return(SUCCESS);
+		return;
 
 	case 11:	/* group/ins, trans, dyn/loc, velocity */
@@ -1849,5 +1854,5 @@
 				scmenu(-1);	/* take down the menu */
 
-			return(SUCCESS);
+			return;
 
 		} else if ((row EQ 21) AND (col LE 3)) {	/* velocity flag */
@@ -1855,8 +1860,10 @@
 			velflag = NOT velflag;
 			ds_vmod();
-			return(SUCCESS);
-
-		} else
-			return(enterit());			/* inst. number */
+			return;
+
+		} else {
+			enterit();			/* inst. number */
+			return;
+		}
 
 /* 
@@ -1880,5 +1887,5 @@
 				vputa(obj8, 7, i, atr);
 
-			return(SUCCESS);
+			return;
 
 		} else if ((row EQ 22) AND (col LE 4)) {	/* r/p source */
@@ -1897,9 +1904,10 @@
 				vputa(obj8, 6, i, atr);
 
-			return(SUCCESS);
+			return;
 
 		} else {
 
-			return(enterit());
+			enterit();
+			return;
 		}
 /* 
@@ -1915,5 +1923,5 @@
 				scmenu(-1);	/* take down menu */
 
-			return(SUCCESS);
+			return;
 
 		} else if ((col GE 10) AND (col LE 25)) {	/* score name */
@@ -1932,8 +1940,10 @@
 			}
 
-			return(SUCCESS);
-
-		} else
-			return(enterit());
+			return;
+
+		} else {
+			enterit();
+			return;
+		}
 /* 
 
@@ -1945,5 +1955,5 @@
 			recsw = FALSE;
 			dsrpmod();
-			return(SUCCESS);
+			return;
 
 		} else if ((col GE 36) AND (col LE 40)) {	/* Recrd */
@@ -1951,5 +1961,5 @@
 			recsw = TRUE;
 			dsrpmod();
-			return(SUCCESS);
+			return;
 
 		} else if ((col GE 42) AND (col LE 47)) {	/* OvrDub */
@@ -1957,5 +1967,5 @@
 			dubsw = NOT dubsw;
 			dsrpmod();
-			return(SUCCESS);
+			return;
 
 		} else if ((col GE 49) AND (col LE 55)) {	/* PunchIn */
@@ -1963,9 +1973,9 @@
 			pchsw = NOT pchsw;
 			dsrpmod();
-			return(SUCCESS);
-
-		}
-
-		return(FAILURE);
+			return;
+
+		}
+
+		return;
 
 	case 16:	/* note display */
@@ -1974,7 +1984,6 @@
 			donote();
 
-		return(SUCCESS);
+		return;
 	}
-
-	return(FAILURE);
 }
+
Index: ram/showcfg.c
===================================================================
--- ram/showcfg.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/showcfg.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -56,6 +56,7 @@
 /* variables defined elsewhere */
 
-extern	short		(*point)();	/* point plotting function pointer */
-extern	short		(*x_key)();	/* "X" key handler pointer */
+extern	void		(*point)(short x, short y, short pen);
+					/* point plotting function pointer */
+extern	void		(*x_key)(void);	/* "X" key handler pointer */
 
 extern	short		LftEdge;	/* left edge of current box */
Index: ram/smscrl.c
===================================================================
--- ram/smscrl.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/smscrl.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -42,7 +42,7 @@
 extern	short	vtyval;				/* subment cursor y value */
 
-extern	unsigned short	*obj10;			/* sequence status object pointer */
-
-extern	unsigned short	cg3[];			/* character generator table */
+extern	unsigned	*obj10;			/* sequence status object pointer */
+
+extern	int	cg3[][256];			/* character generator table */
 
 extern	char	ptdebuf[];			/* patch data entry buffer */
@@ -61,6 +61,6 @@
 */
 
-char	*(*BakLine)();			/* next line backward function pointer */
-char	*(*FwdLine)();			/* next line forward function pointer */
+char	*(*BakLine)(void);		/* next line backward function pointer */
+char	*(*FwdLine)(void);		/* next line forward function pointer */
 
 short	PdScDnF;			/* scroll down flag */
Index: ram/sqdisp.c
===================================================================
--- ram/sqdisp.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/sqdisp.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -25,7 +25,8 @@
 extern	short	nokey(void);
 
-extern	char	*(*BakLine)(), *(*FwdLine)();
-
-extern	unsigned short	*obj8, *obj9, *obj10, *obj11;
+extern	char	*(*BakLine)(void);
+extern	char	*(*FwdLine)(void);
+
+extern	unsigned	*obj8, *obj9, *obj10, *obj11;
 extern	unsigned short	*LineBuf, *ScObAdr, *OldLine;
 extern	unsigned short	LineAtr;
@@ -38,5 +39,5 @@
 extern	short	cxval;
 
-extern	unsigned short	cg3[];
+extern	int	cg3[][256];
 
 extern	char	TheBuf[];		/* display build buffer */
Index: ram/sqexec.c
===================================================================
--- ram/sqexec.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/sqexec.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -45,7 +45,7 @@
 extern	unsigned short	seqdupd;
 
-extern	unsigned short	*obj10;
-
-extern	unsigned short	cg3[];
+extern	unsigned	*obj10;
+
+extern	int		cg3[][256];
 
 extern	struct wordq	ptefifo;
Index: ram/sqfield.c
===================================================================
--- ram/sqfield.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/sqfield.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -26,7 +26,9 @@
 #endif
 
-extern	short	(*xy_up)(), (*xy_dn)();
-extern	short	(*premove)(), (*pstmove)();
-extern	short	(*curtype)();
+extern	void	(*xy_up)(void);
+extern	void	(*xy_dn)(void);
+extern	void	(*premove)(void);
+extern	void	(*pstmove)(void);
+extern	short	(*curtype)(void);
 
 extern	void	select(void);
Index: ram/sqread.c
===================================================================
--- ram/sqread.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/sqread.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -15,5 +15,5 @@
 #include "libdsp.h"
 
-extern	short	errno;			/* system error number */
+extern	int	errno;			/* system error number */
 
 
Index: ram/sqselbx.c
===================================================================
--- ram/sqselbx.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/sqselbx.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -39,5 +39,5 @@
 extern	short	sqatype[];
 
-extern	unsigned short	*obj11;
+extern	unsigned	*obj11;
 
 extern	struct seqent	seqtab[];
Index: ram/swinit.c
===================================================================
--- ram/swinit.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/swinit.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -40,30 +40,32 @@
 PFS	aswtbl[14];		/* assignment switch table */
 
-short	(*curmove)();		/* cursor move function */
-short	(*curtype)();		/* cursor type function */
-short	(*cx_key)();		/* x rate calculation */
-short	(*cx_upd)();		/* x update */
-short	(*cy_key)();		/* y rate calculation */
-short	(*cy_upd)();		/* y update */
-short	(*d_key)();		/* in-field data key processor */
-short	(*e_key)();		/* E key processor */
-short	(*m_key)();		/* M key processor */
-short	(*itxput)();		/* instrument menu text put function */
-short	(*not_fld)();		/* not-in-field data key processor */
-short	(*olddkey)();		/* saved d_key value */
-short	(*oldekey)();		/* saved e_key value */
-short	(*oldmkey)();		/* saved m_key value */
-short	(*oldxkey)();		/* saved x_key value */
-short	(*premove)();		/* cursor pre-move function */
-short	(*pstmove)();		/* cursor post-move function */
-short	(*vt_adv)();		/* vtyper data cursor advance function */
-short	(*vt_bsp)();		/* vtyper data cursor backspace function */
-short	(*vt_cdn)();		/* vtyper data cursor down function */
-short	(*vt_cup)();		/* vtyper data cursor up function */
-short	(*vt_dsp)();		/* vtyper display function */
-short	(*vt_stop)();		/* vtyper exit function */
-short	(*x_key)();		/* X key processor */
-short	(*xy_dn)();		/* cursor - finger on (down) */
-short	(*xy_up)();		/* cursor - finger off (up) */
+void	(*curmove)(void);	/* cursor move function */
+short	(*curtype)(void);	/* cursor type function */
+void	(*cx_key)(void);	/* x rate calculation */
+void	(*cx_upd)(void);	/* x update */
+void	(*cy_key)(void);	/* y rate calculation */
+void	(*cy_upd)(void);	/* y update */
+void	(*d_key)(void);		/* in-field data key processor */
+void	(*e_key)(void);		/* E key processor */
+void	(*m_key)(void);		/* M key processor */
+void	(*itxput)(short row, short col, char *txt, short tag);
+				/* instrument menu text put function */
+void	(*not_fld)(short k);	/* not-in-field data key processor */
+void	(*olddkey)(void);	/* saved d_key value */
+void	(*oldekey)(void);	/* saved e_key value */
+void	(*oldmkey)(void);	/* saved m_key value */
+void	(*oldxkey)(void);	/* saved x_key value */
+void	(*premove)(void);	/* cursor pre-move function */
+void	(*pstmove)(void);	/* cursor post-move function */
+void	(*vt_adv)(void);	/* vtyper data cursor advance function */
+void	(*vt_bsp)(void);	/* vtyper data cursor backspace function */
+void	(*vt_cdn)(void);	/* vtyper data cursor down function */
+void	(*vt_cup)(void);	/* vtyper data cursor up function */
+void	(*vt_dsp)(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf);
+				/* vtyper display function */
+void	(*vt_stop)(void);	/* vtyper exit function */
+void	(*x_key)(void);		/* X key processor */
+void	(*xy_dn)(void);		/* cursor - finger on (down) */
+void	(*xy_up)(void);		/* cursor - finger off (up) */
 
 short	*cratex;		/* cursor x rate table pointer */
Index: ram/vtyper.c
===================================================================
--- ram/vtyper.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/vtyper.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -35,10 +35,16 @@
 extern	short	vtwcol;		/* vtyper window left column */
 
-extern	short	(*vt_adv)();	/* vtyper data cursor advance function */
-extern	short	(*vt_bsp)();	/* vtyper data cursor backspace function */
-extern	short	(*vt_cdn)();	/* vtyper data cursor down function */
-extern	short	(*vt_cup)();	/* vtyper data cursor up function */
-extern	short	(*vt_stop)();	/* vtyper exit function */
-extern	short	(*vt_dsp)();	/* vtyper display function */
+extern	void	(*vt_adv)(void);
+				/* vtyper data cursor advance function */
+extern	void	(*vt_bsp)(void);
+				/* vtyper data cursor backspace function */
+extern	void	(*vt_cdn)(void);
+				/* vtyper data cursor down function */
+extern	void	(*vt_cup)(void);
+				/* vtyper data cursor up function */
+extern	void	(*vt_stop)(void);
+				/* vtyper exit function */
+extern	void	(*vt_dsp)(unsigned *obj, unsigned fg, unsigned bg, short row, short col, char *buf);
+				/* vtyper display function */
 
 extern	unsigned *vtobj;	/* vtyper display object pointer */
Index: ram/wheel.c
===================================================================
--- ram/wheel.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/wheel.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -135,12 +135,12 @@
 */
 
-extern	short	(*curmove)();
-extern	short	(*cx_upd)();
-extern	short	(*cy_upd)();
-extern	short	(*xy_dn)();
-extern	short	(*xy_up)();
-extern	short	(*e_key)();
-extern	short	(*m_key)();
-extern	short	(*x_key)();
+extern	void	(*curmove)(void);
+extern	void	(*cx_upd)(void);
+extern	void	(*cy_upd)(void);
+extern	void	(*xy_dn)(void);
+extern	void	(*xy_up)(void);
+extern	void	(*e_key)(void);
+extern	void	(*m_key)(void);
+extern	void	(*x_key)(void);
 
 extern	short	asig;
Index: ram/wsdsp.c
===================================================================
--- ram/wsdsp.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ ram/wsdsp.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -26,5 +26,5 @@
 extern	unsigned	exp_c(unsigned c);
 
-extern	int	(*point)();
+extern	void	(*point)(short x, short y, short pen);
 
 extern	unsigned	*obj0;
Index: rom/romp.c
===================================================================
--- rom/romp.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ rom/romp.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -142,6 +142,6 @@
 
 #if	ON_B700
-extern	int	B_log_s;
-extern	int	B_dbg_s;
+extern	short	B_log_s;
+extern	short	B_dbg_s;
 extern	char	*B_buf_a;
 extern	int	_bpbin;
Index: vlib/lseg.c
===================================================================
--- vlib/lseg.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ vlib/lseg.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -7,5 +7,5 @@
 */
 
-short	(*point)();
+void	(*point)(short x, short y, short pen);
 
 #define	ABS(x)	((x) < 0 ? (-(x)) : (x))
Index: vlib/vhinit.c
===================================================================
--- vlib/vhinit.c	(revision 342a56fb7d496f8e81315e423dc9309308a74300)
+++ vlib/vhinit.c	(revision 0c834c599f225d78f3cee559f0421011b124be6d)
@@ -22,5 +22,5 @@
 #define	VREG(h,v)	((h<<10)|v)
 
-extern	int	cgtable[];
+extern	int	cgtable[][256];
 extern	int	cg_rows;