diff --git a/ChangeLog b/ChangeLog
index d7f021e41..08948c568 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-01  Hans Breuer  <hans@breuer.org>
+
+	* glib/gmessages.c : include <process.h> for getpid()
+	* glib/gmappedfile.c : include <io.h> for close() etc.
+	* glib/makefile.msc.in : add 	gmappedfile.obj
+
 2005-07-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gkeyfile.c (g_key_file_get_key_comment): 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d7f021e41..08948c568 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2005-07-01  Hans Breuer  <hans@breuer.org>
+
+	* glib/gmessages.c : include <process.h> for getpid()
+	* glib/gmappedfile.c : include <io.h> for close() etc.
+	* glib/makefile.msc.in : add 	gmappedfile.obj
+
 2005-07-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gkeyfile.c (g_key_file_get_key_comment): 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d7f021e41..08948c568 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,9 @@
+2005-07-01  Hans Breuer  <hans@breuer.org>
+
+	* glib/gmessages.c : include <process.h> for getpid()
+	* glib/gmappedfile.c : include <io.h> for close() etc.
+	* glib/makefile.msc.in : add 	gmappedfile.obj
+
 2005-07-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gkeyfile.c (g_key_file_get_key_comment): 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d7f021e41..08948c568 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2005-07-01  Hans Breuer  <hans@breuer.org>
+
+	* glib/gmessages.c : include <process.h> for getpid()
+	* glib/gmappedfile.c : include <io.h> for close() etc.
+	* glib/makefile.msc.in : add 	gmappedfile.obj
+
 2005-07-01  Matthias Clasen  <mclasen@redhat.com>
 
 	* glib/gkeyfile.c (g_key_file_get_key_comment): 
diff --git a/glib/gmappedfile.c b/glib/gmappedfile.c
index db1c5b747..2321ee6b4 100644
--- a/glib/gmappedfile.c
+++ b/glib/gmappedfile.c
@@ -36,6 +36,7 @@
 
 #ifdef G_OS_WIN32
 #include <windows.h>
+#include <io.h>
 #endif
 
 #include "gconvert.h"
diff --git a/glib/gmessages.c b/glib/gmessages.c
index 55582fbbf..8f63b3e56 100644
--- a/glib/gmessages.c
+++ b/glib/gmessages.c
@@ -48,6 +48,7 @@
 #include "galias.h"
 
 #ifdef G_OS_WIN32
+#include <process.h>		/* For getpid() */
 #include <io.h>
 #  define STRICT		/* Strict typing, please */
 #  define _WIN32_WINDOWS 0x0401 /* to get IsDebuggerPresent */
diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index 6d64684c0..f1d87b939 100644
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -43,6 +43,7 @@ glib_OBJECTS =			\
 	ghash.obj		\
 	ghook.obj		\
 	gkeyfile.obj		\
+	gmappedfile.obj	\
 	giochannel.obj		\
 	giowin32.obj		\
 	glist.obj		\