diff --git a/src/end.c b/src/end.c
index c5e6b8d9d..f8ce923b3 100644
--- a/src/end.c
+++ b/src/end.c
@@ -173,8 +173,14 @@ panictrace_setsignals(boolean set)
 }
 #endif /* NO_SIGNAL */
 
+#ifdef CRASHREPORT
+#define USED_FOR_CRASHREPORT
+#else
+#define USED_FOR_CRASHREPORT UNUSED
+#endif
+
 static void
-NH_abort(char *why)
+NH_abort(char *why USED_FOR_CRASHREPORT)
 {
     int gdb_prio = SYSOPT_PANICTRACE_GDB;
     int libc_prio = SYSOPT_PANICTRACE_LIBC;
@@ -1185,6 +1191,7 @@ dump_plines(void)
     }
 }
 
+#ifdef CRASHREPORT
 // lineno==0 gives the most recent message (e.g. "Do you want to call panic..."
 //   if called from #panic)
 static const char *
@@ -1205,7 +1212,8 @@ get_saved_pline(int lineno){
     }
     return NULL;
 }
-#endif
+#endif  /* CRASHREPORT */
+#endif  /* DUMPLOG */
 
 /*ARGSUSED*/
 static void
diff --git a/src/options.c b/src/options.c
index b8d7a3fb4..458828ba7 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1213,6 +1213,7 @@ optfn_catname(
     return petname_optfn(optidx, req, negated, opts, op);
 }
 
+#ifdef CRASHREPORT
 static int
 optfn_crash_email(int optidx UNUSED, int req, boolean negated UNUSED, char *opts, char *op)
 {
@@ -1286,6 +1287,7 @@ optfn_crash_urlmax(int optidx UNUSED, int req, boolean negated UNUSED, char *opt
     }
     return optn_ok;
 }
+#endif /* CRASHREPORT */
 
 #ifdef CURSES_GRAPHICS
 static int