diff --git a/ChangeLog b/ChangeLog
index e48097f15a..019235ed59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2000-12-31  Andreas Jaeger  <aj@suse.de>
 
+	* sunrpc/rpc_main.c: Add noreturn attributes.
+	* sunrpc/rpc_scan.h: Likewise.
+
+	* sunrpc/rpc_hout.c (storexdrfuncdecl): Make static.
+
+	* sunrpc/rpcinfo.c: Add noreturn attribute to brdcst.
+
+	* sunrpc/proto.h: Add noreturn attributes to error and crash.
+
 	* posix/bsd-getpgrp.c: Add prototype to avoid warning.
 
 	* sunrpc/svc_unix.c: Include <rpc/svc.h> for prototypes.
diff --git a/posix/bsd-getpgrp.c b/posix/bsd-getpgrp.c
index a19695f0e2..3289df6ee3 100644
--- a/posix/bsd-getpgrp.c
+++ b/posix/bsd-getpgrp.c
@@ -22,6 +22,7 @@
 /* Don't include unistd.h because it declares a conflicting
    prototype for the POSIX.1 `getpgrp' function.  */
 extern pid_t __getpgid (pid_t);
+extern pid_t __bsd_getpgrp (pid_t);
 
 pid_t
 __bsd_getpgrp (pid_t pid)
diff --git a/sunrpc/create_xid.c b/sunrpc/create_xid.c
index 218b704913..c262aab430 100644
--- a/sunrpc/create_xid.c
+++ b/sunrpc/create_xid.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <sys/time.h>
 #include <bits/libc-lock.h>
+#include <rpc/rpc.h>
 
 /* The RPC code is not threadsafe, but new code should be threadsafe. */
 
diff --git a/sunrpc/rpc_hout.c b/sunrpc/rpc_hout.c
index 39bfae8324..a12810cbb4 100644
--- a/sunrpc/rpc_hout.c
+++ b/sunrpc/rpc_hout.c
@@ -58,7 +58,7 @@ static int undefined2 (const char *type, const char *stop);
 /* store away enough information to allow the XDR functions to be spat
     out at the end of the file */
 
-void
+static void
 storexdrfuncdecl (const char *name, int pointerp)
 {
   xdrfunc * xdrptr;