Index: ram/lcdlbls.x
===================================================================
--- ram/lcdlbls.x	(revision 1c4f9beda6fc6257caf0dfd7cd6d13775ba0b7de)
+++ ram/lcdlbls.x	(revision 511769933a685e3263a016042bbece0635b45825)
@@ -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 1c4f9beda6fc6257caf0dfd7cd6d13775ba0b7de)
+++ ram/swinit.x	(revision 511769933a685e3263a016042bbece0635b45825)
@@ -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];