diff --git a/src/font.h b/src/font.h
index c2ef5cf34..88bedb44f 100644
--- a/src/font.h
+++ b/src/font.h
@@ -10,7 +10,7 @@
 /// \file  font.h
 /// \brief Font setup
 
-#ifndef __FONT_H_
+#ifndef __FONT_H__
 #define __FONT_H__
 
 #define MAX_FONTS 32
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index ad3f1967d..6b83a5896 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -250,7 +250,7 @@ void HU_Init(void)
 
 	if (!dedicated)
 	{
-#define  DIM( start, size ) ( font.start = start, font.size = size )
+#define  DIM( s, n ) ( font.start = s, font.size = n )
 #define ADIM( name )        DIM (name ## _FONTSTART, name ## _FONTSIZE)
 #define   PR( s )           strcpy(font.prefix, s)
 #define  DIG( n )           ( font.digits = n )