diff --git a/tools/fnt2bdf.h b/tools/fnt2bdf.h
index 3dc2590466d..27eafe5967d 100644
--- a/tools/fnt2bdf.h
+++ b/tools/fnt2bdf.h
@@ -30,8 +30,8 @@ enum data_types {dfChar, dfShort, dfLong, dfString};
 
 typedef struct tagFontHeader
 {
-    short dfVersion;		/* Version */
-    long dfSize;		/* Total File Size */
+    SHORT dfVersion;		/* Version */
+    LONG dfSize;		/* Total File Size */
     char dfCopyright[60];	/* Copyright notice */
     FONTINFO16 fi;		/* FONTINFO structure */
 } fnt_hdrS;
diff --git a/tools/fnt2fon.c b/tools/fnt2fon.c
index 87c5ab79ef6..aa7d72b84b8 100644
--- a/tools/fnt2fon.c
+++ b/tools/fnt2fon.c
@@ -40,8 +40,8 @@
 #include "pshpack1.h"
 struct _fnt_header
 {
-    short dfVersion;
-    long dfSize;
+    SHORT dfVersion;
+    LONG dfSize;
     char dfCopyright[60];
     FONTINFO16 fi;
 };