* lib/groupio.h, lib/prototypes.h, lib/pwio.h, lib/sgetgrent.c:

Include <sys/types.h> before <pwd.h> and <grp.h>. It is necessary
	for the definition of uid_t and gid_t.
	* lib/pwmem.c: do not include <pwd.h>, "pwio.h" is sufficient
	here.

lib/pwmem.c

@@ -35,10 +35,9 @@
 
 #ident "$Id$"
 
+#include <stdio.h>
 #include "prototypes.h"
 #include "defines.h"
-#include <pwd.h>
-#include <stdio.h>
 #include "pwio.h"
 
 struct passwd *__pw_dup (const struct passwd *pwent)