diff --git a/font/packer.c b/font/packer.c
index b30e6d375..4ecf8a7f1 100644
--- a/font/packer.c
+++ b/font/packer.c
@@ -77,7 +77,12 @@ int main(int argc, char *argv[])
     fread(font, CELLW*CELLH, 256, f);
     fclose(f);
 
+    printf("#ifndef FONT_H_CHECK\n");
+    printf("#define FONT_H_CHECK\n");
+    
     printf("#define FONT_H %d\n", ysize);
+    
+    printf("#ifdef INCLUDE_FONTDATA\n");
 
     printf("char font_data[] = {\n");
     for(c=0; c<256; c++) {
@@ -97,6 +102,8 @@ int main(int argc, char *argv[])
 	    printf(" ");
     }
     printf("};\n");
+    
+    printf("#endif\n#endif\n");
 
     return 0;
 }
diff --git a/font/unpacker.c b/font/unpacker.c
index a2a4cc661..95fbf0c9e 100644
--- a/font/unpacker.c
+++ b/font/unpacker.c
@@ -3,6 +3,8 @@
 #include <string.h>
 #include <math.h>
 
+#define INCLUDE_FONTDATA
+
 #include "font.h"
 
 #define CELLW	12