diff --git a/ex.h b/ex.h
index 73b6ada..5aa2f97 100644
--- a/ex.h
+++ b/ex.h
@@ -72,7 +72,7 @@
  *
  *	from ex.h	7.7.1.1 (Berkeley) 8/12/86
  *
- *	@(#)ex.h	1.50 (gritter) 2/13/05
+ *	@(#)ex.h	1.51 (gritter) 2/15/05
  */
 
 /*
@@ -333,6 +333,7 @@ extern	 struct	option options[NOPTS + 1];
  * -DISO8859_1 enables all characters >= 0240 regardless of
  *  LC_CTYPE.
  */
+#define	INVBIT		0x20000000
 #define	MULTICOL	0x40000000
 
 #if defined (MB)
@@ -343,7 +344,6 @@ extern	 struct	option options[NOPTS + 1];
 typedef int	cell;
 var	int	TRIM;
 var	int	QUOTE;
-#define	INVBIT	0x20000000
 #define	printable(c)	(((c)&INVBIT) == 0 && \
 		(mb_cur_max > 1 ? iswprint((c)&TRIM) : isprint((c)&TRIM)))
 #define	ext(c)		(((c) & 0177) == 0)
diff --git a/ex_proto.h b/ex_proto.h
index c9a7580..dca6ff9 100644
--- a/ex_proto.h
+++ b/ex_proto.h
@@ -70,7 +70,7 @@
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *	@(#)ex_proto.h	1.25 (gritter) 1/2/05
+ *	@(#)ex_proto.h	1.26 (gritter) 2/15/05
  */
 
 /*
@@ -187,8 +187,8 @@ extern void checkmodeline(char *);
 #ifdef	MB
 extern int mbtowi(int *c, const char *s, size_t n);
 extern int widthok(int c);
-extern int GETWC(char *);
 #endif	/* MB */
+extern int GETWC(char *);
 /* ex_put.c */
 extern int (*setlist(int))(int);
 extern void (*setnumb(int))(int);
diff --git a/ex_vget.c b/ex_vget.c
index 2205ecc..e3a50d0 100644
--- a/ex_vget.c
+++ b/ex_vget.c
@@ -73,7 +73,7 @@
 
 #ifndef	lint
 #ifdef	DOSCCS
-static char sccsid[] = "@(#)ex_vget.c	1.28 (gritter) 1/20/05";
+static char sccsid[] = "@(#)ex_vget.c	1.29 (gritter) 2/15/05";
 #endif
 #endif
 
@@ -576,10 +576,10 @@ static void
 imacpush(int *ip, int canundo)
 {
 	char	buf[BUFSIZ], *bp = buf;
-	int	n;
 
 #ifdef	MB
 	do {
+		int	n;
 		n = wctomb(bp, *ip&TRIM);
 		bp += n;
 	} while (*ip++);