diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 8a2fb2b4376b..25f56a37869e 100644
--- a/bin/mv/mv.c
+++ b/bin/mv/mv.c
@@ -57,7 +57,9 @@ static const char rcsid[] =
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <grp.h>
 #include <limits.h>
+#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/bin/rm/rm.c b/bin/rm/rm.c
index eee413537483..54617241fbb9 100644
--- a/bin/rm/rm.c
+++ b/bin/rm/rm.c
@@ -54,6 +54,8 @@ static const char rcsid[] =
 #include <errno.h>
 #include <fcntl.h>
 #include <fts.h>
+#include <grp.h>
+#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/include/grp.h b/include/grp.h
index 2e245d5afc04..5b101cff8a2b 100644
--- a/include/grp.h
+++ b/include/grp.h
@@ -64,6 +64,7 @@ int setgrent __P((void));
 void endgrent __P((void));
 void setgrfile __P((const char *));
 int setgroupent __P((int));
+char	*group_from_gid __P((gid_t, int));
 #endif
 __END_DECLS
 
diff --git a/include/pwd.h b/include/pwd.h
index 88d705d89621..9a9398da25be 100644
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -36,6 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)pwd.h	8.2 (Berkeley) 1/21/94
+ * $FreeBSD$
  */
 
 #ifndef _PWD_H_
@@ -105,6 +106,7 @@ struct passwd	*getpwent __P((void));
 int		 setpassent __P((int));
 void		 setpwent __P((void));
 void		 endpwent __P((void));
+char		*user_from_uid __P((uid_t, int));
 #endif
 __END_DECLS
 
diff --git a/include/stdlib.h b/include/stdlib.h
index 476f5204f375..1cdad58245de 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -169,7 +169,6 @@ int	 getloadavg __P((double [], int));
 __const char *
 	 getprogname __P((void));
 
-char	*group_from_gid __P((unsigned long, int));
 int	 heapsort __P((void *, size_t, size_t,
 	    int (*)(const void *, const void *)));
 char	*initstate __P((unsigned long, char *, long));
@@ -205,7 +204,6 @@ unsigned long long
 __uint64_t
 	 strtouq __P((const char *, char **, int));
 void	 unsetenv __P((const char *));
-char	*user_from_uid __P((unsigned long, int));
 #endif /* !_ANSI_SOURCE && !_POSIX_SOURCE */
 __END_DECLS