shk.c and priest.c vs 'onefile'

src/priest.c

@@ -91,6 +91,7 @@ move_special(struct monst *mtmp, boolean in_his_shop, schar appr,
             }
         }
     }
+#undef GDIST
     if (mtmp->ispriest && avoid && nix == omx && niy == omy
         && onlineu(omx, omy)) {
         /* might as well move closer as long it's going to stay
@@ -901,4 +902,7 @@ restpriest(struct monst *mtmp, boolean ghostly)
     }
 }
 
+#undef ALGN_SINNED
+#undef ALGN_PIOUS
+
 /*priest.c*/

src/shk.c

@@ -4727,6 +4727,7 @@ shk_move(struct monst *shkp)
                     appr = gtx = gty = 0;
             }
         }
+#undef GDIST
     }
 
     z = move_special(shkp, inhishop(shkp), appr, uondoor, avoid, omx, omy,
@@ -5856,4 +5857,17 @@ use_unpaid_trapobj(struct obj *otmp, coordxy x, coordxy y)
     }
 }
 
+#ifdef CONTAINED_BUYING
+#undef CONTAINED_BUYING
+#endif
+#undef PAY_SOME
+#undef PAY_BUY
+#undef PAY_CANT
+#undef PAY_SKIP
+#undef PAY_BROKE
+#undef NOTANGRY
+#undef ANGRY
+#undef IS_SHOP
+#undef muteshk
+
 /*shk.c*/