Index: iolib/mdump.x
===================================================================
--- iolib/mdump.x	(revision 83ea4323db515f8436c0c3d4c5ab2c3886cb8f7c)
+++ iolib/mdump.x	(revision e4a1376d1263f85f90c295f0fba97b9611239293)
@@ -15,3 +15,3 @@
 */
 
-extern	void		mdump(int8_t *begin, int8_t *end, int32_t start);
+extern	void		mdump(int8_t *from, int8_t *to, int32_t start);
Index: libcio/filesys.x
===================================================================
--- libcio/filesys.x	(revision 83ea4323db515f8436c0c3d4c5ab2c3886cb8f7c)
+++ libcio/filesys.x	(revision e4a1376d1263f85f90c295f0fba97b9611239293)
@@ -46,5 +46,5 @@
 extern	int16_t		_getfat(uint8_t *bufad, struct bpb *bpp, int16_t nfat);
 extern	int16_t		_gtcl12(uint8_t *fat, int16_t cl);
-extern	int16_t		_inifcb(struct fcb *fcp, int8_t *name, int8_t *ext, uint16_t mode);
+extern	int16_t		_inifcb(struct fcb *fcp, int8_t *name, int8_t *ext, uint16_t flags);
 extern	int16_t		_newcls(void);
 extern	int16_t		_nsic(struct fcb *fcp, struct bpb *bpp, uint8_t *fp);
Index: libcio/scan.x
===================================================================
--- libcio/scan.x	(revision 83ea4323db515f8436c0c3d4c5ab2c3886cb8f7c)
+++ libcio/scan.x	(revision e4a1376d1263f85f90c295f0fba97b9611239293)
@@ -15,4 +15,4 @@
 */
 
-extern	int16_t		scanfmt(int16_t (*getsub)(int16_t which), int8_t *fmt, int16_t **args);
+extern	int16_t		scanfmt(int16_t (*getsub)(int16_t what), int8_t *fmt, int16_t **args);
 extern	int16_t		sscanf(int8_t *string, int8_t *fmt, int16_t *args);
Index: misc/proto.c
===================================================================
--- misc/proto.c	(revision 83ea4323db515f8436c0c3d4c5ab2c3886cb8f7c)
+++ misc/proto.c	(revision e4a1376d1263f85f90c295f0fba97b9611239293)
@@ -24,10 +24,10 @@
 void		(*pulse2)(void);
 
-int32_t		crshrg[16];
+uint32_t	crshrg[16];
 int16_t		wzcrsh;
-int16_t		*crshpc;
-int16_t		*crshsp;
-int16_t		*crshus;
-int16_t		crshst[16];
+uint32_t	crshpc;
+uint32_t	crshsp;
+uint32_t	crshus;
+uint16_t	crshst[16];
 uint16_t	crshsr;
 int8_t		crshvc[4];
Index: ram/lcdlbls.x
===================================================================
--- ram/lcdlbls.x	(revision 83ea4323db515f8436c0c3d4c5ab2c3886cb8f7c)
+++ ram/lcdlbls.x	(revision e4a1376d1263f85f90c295f0fba97b9611239293)
@@ -46,13 +46,13 @@
 extern	void		l_clock(int16_t stat, int16_t _2);
 extern	void		l_dflt(int16_t stat, int16_t _2);
-extern	void		l_eq(int16_t stat, int16_t sig);
+extern	void		l_eq(int16_t stat, int16_t _2);
 extern	void		l_goto(int16_t stat, int16_t _2);
 extern	void		l_group(int16_t stat, int16_t grp);
-extern	void		l_init(int16_t stat, int16_t sig);
+extern	void		l_init(int16_t stat, int16_t _2);
 extern	void		l_inst(int16_t stat, int16_t _2);
 extern	void		l_load(int16_t stat, int16_t _2);
 extern	void		l_none(int16_t _1, int16_t _2);
-extern	void		l_other(int16_t stat, int16_t sig);
-extern	void		l_prmtr(int16_t stat, int16_t sig);
+extern	void		l_other(int16_t stat, int16_t _2);
+extern	void		l_prmtr(int16_t stat, int16_t _2);
 extern	void		l_voice(int16_t stat, int16_t vce);
 extern	void		lcd_on(void);
Index: ram/swinit.x
===================================================================
--- ram/swinit.x	(revision 83ea4323db515f8436c0c3d4c5ab2c3886cb8f7c)
+++ ram/swinit.x	(revision e4a1376d1263f85f90c295f0fba97b9611239293)
@@ -14,4 +14,6 @@
 #include "stddefs.h"
 #include "stdint.h"
+
+#include "vtyper.x"
 
 /*
@@ -159,10 +161,10 @@
 extern	int8_t		*vlbptr[3];
 extern	int16_t		vmtab[NUMHARM];
-extern	void		(*vt_adv)(void);
-extern	void		(*vt_bsp)(void);
-extern	void		(*vt_cdn)(void);
-extern	void		(*vt_cup)(void);
-extern	void		(*vt_dsp)(uint16_t *obj, uint16_t fg, uint16_t bg, int16_t row, int16_t col, int8_t *buf);
-extern	void		(*vt_stop)(void);
+extern	vtcurs		vt_adv;
+extern	vtcurs		vt_bsp;
+extern	vtcurs		vt_cdn;
+extern	vtcurs		vt_cup;
+extern	vtchar		vt_dsp;
+extern	vtcurs		vt_stop;
 extern	int8_t		*vtdeptr;
 extern	int16_t		wsbuf[NUMWPCAL];