diff --git a/win/share/tilemap.c b/win/share/tilemap.c
index ce4e2198f..eb571fac7 100644
--- a/win/share/tilemap.c
+++ b/win/share/tilemap.c
@@ -1346,12 +1346,18 @@ main(int argc UNUSED, char *argv[] UNUSED)
     Fprintf(ofp,
             "/* This file is automatically generated.  Do not edit. */\n");
     Fprintf(ofp, "\n#include \"hack.h\"\n");
-    Fprintf(ofp, "\n#ifdef USE_TILES\n");
+    Fprintf(ofp, "\n#ifndef TILES_IN_GLYPHMAP\n");
+    Fprintf(ofp, "\n#else /* ?TILES_IN_GLYPHMAP */\n");
+    Fprintf(ofp, "\nenum special_tiles {\n");
+    Fprintf(ofp, "    TILE_CORR = %d,\n", TILE_corr); 
+    Fprintf(ofp, "    TILE_STONE = %d,\n", TILE_stone); 
+    Fprintf(ofp, "    TILE_UNEXPLORED = %d\n", TILE_unexplored);
+    Fprintf(ofp, "};\n");
     Fprintf(ofp, "\nint total_tiles_used = %d,\n", laststatuetile + 1);
-    Fprintf(ofp, "%sTile_corr = %d,\n", indent, TILE_corr); /* X11 uses it */
-    Fprintf(ofp, "%sTile_stone = %d,\n",  indent, TILE_stone);
-    Fprintf(ofp, "%sTile_unexplored = %d;\n",  indent, TILE_unexplored);
-    Fprintf(ofp, "int maxmontile = %d,\n", lastmontile);
+    Fprintf(ofp, "%sTile_corr = TILE_CORR,\n", indent); /* X11 uses it */
+    Fprintf(ofp, "%sTile_stone = TILE_STONE,\n",  indent);
+    Fprintf(ofp, "%sTile_unexplored = TILE_UNEXPLORED,\n",  indent);
+    Fprintf(ofp, "%smaxmontile = %d,\n", indent, lastmontile);
     Fprintf(ofp, "%smaxobjtile = %d,\n", indent, lastobjtile);
     Fprintf(ofp, "%smaxothtile = %d;\n\n", indent, lastothtile);
     Fprintf(ofp, "/* glyph, ttychar, { %s%s } */\n",
@@ -1360,11 +1366,11 @@ main(int argc UNUSED, char *argv[] UNUSED)
     enhanced = ", 0"; /* replace ", utf8rep" since we're done with that */
 #endif
     Fprintf(ofp, "const glyph_info nul_glyphinfo = { \n");
-    Fprintf(ofp, "%sNO_GLYPH, ' ',\n", indent);
+    Fprintf(ofp, "%sNO_GLYPH, ' ', NO_COLOR,\n", indent);
     Fprintf(ofp, "%s%s/* glyph_map */\n", indent, indent);
-    Fprintf(ofp, "%s%s{ %s, %d%s }\n", indent, indent,
+    Fprintf(ofp, "%s%s{ %s, TILE_UNEXPLORED%s }\n", indent, indent,
             "MG_UNEXPL, { NO_COLOR, SYM_UNEXPLORED + SYM_OFF_X }",
-            TILE_unexplored, enhanced);
+            enhanced);
     Fprintf(ofp, "};\n");
     Fprintf(ofp, "\nglyph_map glyphmap[MAX_GLYPH] = {\n");
 
@@ -1385,7 +1391,7 @@ main(int argc UNUSED, char *argv[] UNUSED)
                 tilemap[i].name);
     }
     Fprintf(ofp, "};\n");
-    Fprintf(ofp, "\n#endif /* USE_TILES */\n");
+    Fprintf(ofp, "\n#endif /* TILES_IN_GLYPHMAP */\n");
     Fprintf(ofp, "\n/*tile.c*/\n");
 
     (void) fclose(ofp);