diff --git a/src/extralev.c b/src/extralev.c
index 8904ad140..86180178b 100644
--- a/src/extralev.c
+++ b/src/extralev.c
@@ -22,6 +22,7 @@ void
 roguejoin(coordxy x1, coordxy y1, coordxy x2, coordxy y2, int horiz)
 {
     register coordxy x, y, middle;
+
     if (horiz) {
         middle = x1 + rn2(x2 - x1 + 1);
         for (x = min(x1, middle); x <= max(x1, middle); x++)
@@ -188,6 +189,7 @@ miniwalk(coordxy x, coordxy y)
         }
         miniwalk(x, y);
     }
+#undef doorhere
 }
 
 void
@@ -272,6 +274,7 @@ makeroguerooms(void)
             if (here.doortable & UP)
                 impossible("up end of %d, %d never connected?", x, y);
         }
+#undef here
 }
 
 void