diff --git a/ChangeLog b/ChangeLog
index 051af8a4..399641ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,11 @@
 	utimes() as a replacement for futimes().
 	* configure.in, lib/nscd.h, lib/nscd.c: Added --with-nscd flag to
 	support systems without nscd.
+	* 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.
 
 2008-08-26  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/lib/groupio.h b/lib/groupio.h
index 9f2984c9..d229845a 100644
--- a/lib/groupio.h
+++ b/lib/groupio.h
@@ -35,6 +35,7 @@
 #ifndef _GROUPIO_H
 #define _GROUPIO_H
 
+#include <sys/types.h>
 #include <grp.h>
 
 extern int gr_close (void);
diff --git a/lib/prototypes.h b/lib/prototypes.h
index f1ffc50a..feeedc4d 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -48,6 +48,7 @@
 #else
 #include <utmp.h>
 #endif
+#include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
 #include <shadow.h>
diff --git a/lib/pwio.h b/lib/pwio.h
index 28f8bbd5..52c7bf33 100644
--- a/lib/pwio.h
+++ b/lib/pwio.h
@@ -35,7 +35,9 @@
 #ifndef _PWIO_H
 #define _PWIO_H
 
+#include <sys/types.h>
 #include <pwd.h>
+
 extern int pw_close (void);
 extern const struct passwd *pw_locate (const char *name);
 extern const struct passwd *pw_locate_uid (uid_t uid);
diff --git a/lib/pwmem.c b/lib/pwmem.c
index 95a6137a..84dee3d5 100644
--- a/lib/pwmem.c
+++ b/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)
diff --git a/lib/sgetgrent.c b/lib/sgetgrent.c
index 6f090aaf..186ee40f 100644
--- a/lib/sgetgrent.c
+++ b/lib/sgetgrent.c
@@ -35,6 +35,7 @@
 #ident "$Id$"
 
 #include <stdio.h>
+#include <sys/types.h>
 #include <grp.h>
 #include "defines.h"
 #include "prototypes.h"