--- ./src/setfont.c.bad	2008-01-26 13:55:57 +0100
+++ ./src/setfont.c	2008-03-02 20:00:21 +0100
@@ -106,6 +106,7 @@
 	char *mfil, *ufil, *Ofil, *ofil, *omfil, *oufil, *console;
 	int ifilct = 0, fd, i, iunit, hwunit, no_m, no_u;
 	int restore = 0;
+	int kd_mode = -1;
 
 	set_progname(argv[0]);
 
@@ -189,7 +190,6 @@
 
 	fd = getfd(console);
 
-	int kd_mode = -1;
 	if (!ioctl(fd, KDGETMODE, &kd_mode) && (kd_mode == KD_GRAPHICS))
 	  {
 	    /*
--- ./src/loadkeys.y.bad	2008-01-26 13:55:57 +0100
+++ ./src/loadkeys.y	2008-03-02 20:00:46 +0100
@@ -344,13 +344,13 @@
 	else if (console)
 	  {
 	    char *buf = strdup(console);	/* make writable */
-	    char *e, *s = buf;
+	    char c, *e, *s = buf;
 	    while (*s)
 	      {
 	        while (      *s == ' ' || *s == '\t' || *s == ',') s++;
 		e = s;
 		while (*e && *e != ' ' && *e != '\t' && *e != ',') e++;
-		char c = *e;
+		c = *e;
 		*e = '\0';
 		if (verbose) printf("%s\n", s);
 	        loadkeys(s, &warned);
--- ./src/kdfontop.c.bad	2008-01-26 13:55:57 +0100
+++ ./src/kdfontop.c	2008-03-02 20:01:15 +0100
@@ -227,6 +227,7 @@
 	struct consolefontdesc cfd;
 	struct console_font_op cfo;
 	int i;
+	int loop = 0;
 
 	if (!width)
 		width = 8;
@@ -283,7 +284,6 @@
 
 	/* Third attempt: PIO_FONT */
 	/* This will load precisely 256 chars, independent of count */
-	int loop = 0;
 
 	/* we allow ourselves to hang here for ca 5 seconds, xdm may be playing tricks on us. */
 	while ((loop++ < 20) && (i = ioctl(fd, PIO_FONT, buf)))