diff --git a/ChangeLog b/ChangeLog
index 4b56d5aaa..bc699d275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* glib/gthread.c: Include windows.h and fix
+	include order. (#394258, Kazuki Iwamoto)
+
 2007-01-12  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Make G_GNUC_INTERNAL a no-op for
diff --git a/glib/gthread.c b/glib/gthread.c
index de8855fdc..69c15e958 100644
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -34,19 +34,21 @@
 
 #include "config.h"
 
+#include "glib.h"
+#include "gthreadprivate.h"
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
 #ifndef G_OS_WIN32
+#include <windows.h>
 #include <sys/time.h>
 #include <time.h>
 #endif /* G_OS_WIN32 */
 
 #include <string.h>
 
-#include "glib.h"
-#include "gthreadprivate.h"
 #include "galias.h"
 
 GQuark