diff --git a/include/extern.h b/include/extern.h
index f6063cef9..e8a4f29d9 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -414,7 +414,7 @@ extern int enter_explore_mode(void);
 extern boolean bind_mousebtn(int, const char *);
 extern boolean bind_key(uchar, const char *);
 extern void dokeylist(void);
-extern coordxy xytod(coordxy, coordxy);
+extern int xytod(coordxy, coordxy);
 extern void dtoxy(coord *, int);
 extern int movecmd(char, int);
 extern int dxdy_moveok(void);
diff --git a/src/cmd.c b/src/cmd.c
index d6ac2c580..51524a199 100644
--- a/src/cmd.c
+++ b/src/cmd.c
@@ -3604,7 +3604,7 @@ rhack(int key)
 }
 
 /* convert an x,y pair into a direction code */
-coordxy
+int
 xytod(coordxy x, coordxy y)
 {
     int dd;
diff --git a/src/trap.c b/src/trap.c
index 38b970aa6..2664fbf0a 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -6436,7 +6436,8 @@ conjoined_pits(
     struct trap *trap1,
     boolean u_entering_trap2)
 {
-    coordxy dx, dy, diridx, adjidx;
+    coordxy dx, dy;
+    int diridx, adjidx;
 
     if (!trap1 || !trap2)
         return FALSE;
diff --git a/src/zap.c b/src/zap.c
index 7fc54146e..a9e63105d 100644
--- a/src/zap.c
+++ b/src/zap.c
@@ -4126,7 +4126,7 @@ boomhit(struct obj *obj, coordxy dx, coordxy dy)
     gb.bhitpos.x = u.ux;
     gb.bhitpos.y = u.uy;
     boom = counterclockwise ? S_boomleft : S_boomright;
-    i = (int) xytod(dx, dy);
+    i = xytod(dx, dy);
     tmp_at(DISP_FLASH, cmap_to_glyph(boom));
     for (ct = 0; ct < 10; ct++) {
         i = DIR_CLAMP(i);