diff --git a/ChangeLog b/ChangeLog
index cc4760e1..1803beb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-12-22  Eli Zaretskii  <eliz@gnu.org>
 
+	* config.h.W32: Include sys/types.h.
+	[!_PID_T_] (pid_t): Define only if not already defined by sys/types.h.
+
 	* vpath.c (construct_vpath_list) [HAVE_DOS_PATHS]: Support VPATH
 	values that use `:' in drive letters, when PATH_SEPARATOR_CHAR is
 	also `:'.
diff --git a/config.h.W32.template b/config.h.W32.template
index 9a845a55..4ef1ab92 100644
--- a/config.h.W32.template
+++ b/config.h.W32.template
@@ -418,11 +418,16 @@ this program.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
+#include <sys/types.h>
+
 /* Define to `int' if <sys/types.h> doesn't define. */
 #define gid_t int
 
 /* Define to `int' if <sys/types.h> does not define. */
+/* GCC 4.x reportedly defines pid_t.  */
+#ifndef _PID_T_
 #define pid_t int
+#endif
 
 /* Define to `int' if <sys/types.h> doesn't define. */
 #define uid_t int