diff --git a/fish/fish.h b/fish/fish.h
index a6cc8c99c..b7ed922db 100644
--- a/fish/fish.h
+++ b/fish/fish.h
@@ -78,7 +78,7 @@ extern int do_glob (const char *cmd, int argc, char *argv[]);
 extern int do_more (const char *cmd, int argc, char *argv[]);
 
 /* in rc.c (remote control) */
-extern void rc_listen (void);
+extern void rc_listen (void) __attribute__((noreturn));
 extern int rc_remote (int pid, const char *cmd, int argc, char *argv[],
                       int exit_on_error);
 
diff --git a/fish/rc.c b/fish/rc.c
index 57f1c3625..5423c2272 100644
--- a/fish/rc.c
+++ b/fish/rc.c
@@ -34,8 +34,6 @@
 #include "fish.h"
 #include "rc_protocol.h"
 
-#define UNIX_PATH_MAX 108
-
 static void
 create_sockpath (pid_t pid, char *sockpath, int len, struct sockaddr_un *addr)
 {