diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 1dc2c1420..0149b8d30 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2212,7 +2212,7 @@ boolean CL_Responder(event_t *ev)
 	if (cl_mode != CL_CHALLENGE)
 		return false;
 
-	if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && hu_font[ch-HU_FONTSTART])
+	if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && fontv[HU_FONT].font[ch-HU_FONTSTART])
 	  || ch == ' ') // Allow spaces, of course
 	{
 		len = strlen(cl_challengepassword);
diff --git a/src/g_game.c b/src/g_game.c
index 10bd76acc..6f602661b 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -8273,7 +8273,7 @@ boolean G_DemoTitleResponder(event_t *ev)
 		return true;
 	}
 
-	if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && hu_font[ch-HU_FONTSTART])
+	if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && fontv[HU_FONT].font[ch-HU_FONTSTART])
 	  || ch == ' ') // Allow spaces, of course
 	{
 		len = strlen(demo.titlename);
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 36ecb1101..ad3f1967d 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -975,7 +975,7 @@ static inline boolean HU_keyInChatString(char *s, char ch)
 {
 	size_t l;
 
-	if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && hu_font[ch-HU_FONTSTART])
+	if ((ch >= HU_FONTSTART && ch <= HU_FONTEND && fontv[HU_FONT].font[ch-HU_FONTSTART])
 	  || ch == ' ') // Allow spaces, of course
 	{
 		l = strlen(s);
@@ -1409,7 +1409,7 @@ static char *CHAT_WordWrap(INT32 x, INT32 w, INT32 option, const char *string)
 			c = toupper(c);
 		c -= HU_FONTSTART;
 
-		if (c < 0 || c >= HU_FONTSIZE || !hu_font[c])
+		if (c < 0 || c >= HU_FONTSIZE || !fontv[HU_FONT].font[c])
 		{
 			chw = spacewidth;
 			lastusablespace = i;
diff --git a/src/k_kart.c b/src/k_kart.c
index 10d772ba0..d68a44e1c 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -8495,7 +8495,7 @@ static void K_drawInput(void)
 		V_DrawFill(x+(xoffs), y+BUTTH, BUTTW-1, 2, splitflags|31);\
 	}\
 	V_DrawFill(x+(xoffs), y+offs, BUTTW-1, BUTTH, col);\
-	V_DrawFixedPatch((x+1+(xoffs))<<FRACBITS, (y+offs+1)<<FRACBITS, FRACUNIT, splitflags, tny_font[symb-HU_FONTSTART], NULL)
+	V_DrawFixedPatch((x+1+(xoffs))<<FRACBITS, (y+offs+1)<<FRACBITS, FRACUNIT, splitflags, fontv[TINY_FONT].font[symb-HU_FONTSTART], NULL)
 
 	drawbutt(-2*BUTTW, BT_ACCELERATE, 'A');
 	drawbutt(  -BUTTW, BT_BRAKE,      'B');
diff --git a/src/st_stuff.h b/src/st_stuff.h
index 16f7b8811..4b76f06da 100644
--- a/src/st_stuff.h
+++ b/src/st_stuff.h
@@ -64,7 +64,6 @@ extern boolean st_overlay; // sb overlay on or off when fullscreen
 
 extern lumpnum_t st_borderpatchnum;
 // patches, also used in intermission
-extern patch_t *tallnum[10];
 extern patch_t *sboscore;
 extern patch_t *sbotime;
 extern patch_t *sbocolon;