Move user_from_uid to pwd.h

Move group_from_gid to grp.h
Remove from stdlib.h
Make the prototypes match the code
Fix rm and mv to include new files.

NetBSD has these defined in those files, and others too that I've not
done.

Approved by: terminal room kabal
Reviewed by: jhb, phk

2 files changed, 4 insertions, 0 deletions

diff --git a/bin/mv/mv.c b/bin/mv/mv.c
index 8a2fb2b..25f56a3 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 eee4135..5461724 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>