diff --git a/win/X11/winX.c b/win/X11/winX.c
index 4aaebf7f2..dff0eafa3 100644
--- a/win/X11/winX.c
+++ b/win/X11/winX.c
@@ -1961,7 +1961,7 @@ boolean complain;
     wp = &window_list[newwin];
     X11_start_menu(newwin);
 
-    any = zeroany;
+    any = cg.zeroany;
     while (dlb_fgets(line, LLEN, fp)) {
         X11_add_menu(newwin, NO_GLYPH, &any, 0, 0, ATR_NONE,
                      line, MENU_UNSELECTED);
diff --git a/win/X11/winstat.c b/win/X11/winstat.c
index 06d882c29..82e025d2b 100644
--- a/win/X11/winstat.c
+++ b/win/X11/winstat.c
@@ -1074,11 +1074,11 @@ long new_value;
                 }
                 Strcat(buf, mname);
             } else
-                Strcat(buf, rank_of(u.ulevel, pl_character[0], flags.female));
+                Strcat(buf, rank_of(u.ulevel, g.pl_character[0], flags.female));
 
         } else if (attr_rec == &shown_stats[F_DLEVEL]) {
             if (!describe_level(buf)) {
-                Strcpy(buf, dungeons[u.uz.dnum].dname);
+                Strcpy(buf, g.dungeons[u.uz.dnum].dname);
                 Sprintf(eos(buf), ", level %d", depth(&u.uz));
             }
         } else {
diff --git a/win/X11/wintext.c b/win/X11/wintext.c
index e6b02758a..88ad40f18 100644
--- a/win/X11/wintext.c
+++ b/win/X11/wintext.c
@@ -314,7 +314,7 @@ struct xwindow *wp;
              XtParseTranslationTable(text_translations));
     num_args++;
 
-    wp->w = XtCreateManagedWidget(killer.name[0] && WIN_MAP == WIN_ERR
+    wp->w = XtCreateManagedWidget(g.killer.name[0] && WIN_MAP == WIN_ERR
                                       ? "tombstone"
                                       : "text_text", /* name */
                                   asciiTextWidgetClass,
@@ -496,7 +496,7 @@ calculate_rip_text(int how, time_t when)
     Sprintf(rip_line[NAME_LINE], "%s", g.plname);
 
     /* Put $ on stone */
-    Sprintf(rip_line[GOLD_LINE], "%ld Au", done_money);
+    Sprintf(rip_line[GOLD_LINE], "%ld Au", g.done_money);
     /* Put together death description */
     formatkiller(buf, sizeof buf, how, FALSE);