diff --git a/Makefile.msvc b/Makefile.msvc
index ae16195..bc4e25c 100644
--- a/Makefile.msvc
+++ b/Makefile.msvc
@@ -90,7 +90,7 @@ $(OBJDIR)\solvespace.exe: $(SSOBJS) $(SRFOBJS) $(W32OBJS) $(RES)
 $(RES): win32\$(@B).rc icon.ico
 	$(RC) /fo$@ win32\$(@B).rc
 
-$(OBJDIR)\glhelper.obj: bitmapextra.table bitmapfont.table font.table
+$(OBJDIR)\glhelper.obj: bitmapextra.table.h bitmapfont.table.h font.table.h
 
 $(OBJDIR)\textwin.obj: icons.h
 
@@ -99,7 +99,7 @@ $(OBJDIR)\toolbar.obj: icons.h
 icons.h: icons\*.png png2c.pl
 	$(PERL) png2c.pl $@ icons-proto.h
 
-bitmapextra.table: icons\*.png pngchar2c.pl
+bitmapextra.table.h: icons\*.png pngchar2c.pl
 	$(PERL) pngchar2c.pl >tmp.$@
 	move /y tmp.$@ $@
 
diff --git a/bitmapextra.table b/bitmapextra.table.h
similarity index 100%
rename from bitmapextra.table
rename to bitmapextra.table.h
diff --git a/bitmapfont.table b/bitmapfont.table.h
similarity index 99%
rename from bitmapfont.table
rename to bitmapfont.table.h
index d444070..49daa2c 100644
--- a/bitmapfont.table
+++ b/bitmapfont.table.h
@@ -2175,5 +2175,5 @@ static const BYTE FontTexture[256*16*16] = {
   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 
   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   0, 
 
-#include "bitmapextra.table"
+#include "bitmapextra.table.h"
 };
diff --git a/font.table b/font.table.h
similarity index 100%
rename from font.table
rename to font.table.h
diff --git a/glhelper.cpp b/glhelper.cpp
index 7bad33c..96b0176 100644
--- a/glhelper.cpp
+++ b/glhelper.cpp
@@ -6,10 +6,10 @@
 #include "solvespace.h"
 
 // A public-domain Hershey vector font ("Simplex").
-#include "font.table"
+#include "font.table.h"
 
 // A bitmap font.
-#include "bitmapfont.table"
+#include "bitmapfont.table.h"
 
 static bool ColorLocked;
 static bool DepthOffsetLocked;
diff --git a/tools/Makefile b/tools/Makefile
index dd236a9..7969d97 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,4 +1,4 @@
 all:
     cl ttf2c.cpp user32.lib gdi32.lib comctl32.lib
-    ttf2c.exe > ..\bitmapfont.table
+    ttf2c.exe > ..\bitmapfont.table.h
 
diff --git a/tools/ttf2c.cpp b/tools/ttf2c.cpp
index 2e11dfa..8b9a924 100644
--- a/tools/ttf2c.cpp
+++ b/tools/ttf2c.cpp
@@ -45,7 +45,7 @@ int main(void)
         }
         printf("\n");
     }
-    printf("#include \"bitmapextra.table\"\n");
+    printf("#include \"bitmapextra.table.h\"\n");
     printf("};\n");
 
     return 0;