diff --git a/ChangeLog b/ChangeLog
index e560b9d16..7c76dc735 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-19  Tor Lillqvist  <tml@novell.com>
+
+	* glib/gdir.c: Include the dirent.h and wdirent.c from
+	../build/win32/dirent directly here when compiling with MSVC and
+	without HAVE_DIRENT_H.
+
 2008-05-19  Hans Breuer  <hans@breuer.org>
 
 	* glib/makefile.msc : added gi18n.c
diff --git a/glib/gdir.c b/glib/gdir.c
index f9b1457c4..aab6c59ae 100644
--- a/glib/gdir.c
+++ b/glib/gdir.c
@@ -40,6 +40,11 @@
 
 #include "galias.h"
 
+#if defined (_MSC_VER) && !defined (HAVE_DIRENT_H)
+#include "../build/win32/dirent/dirent.h"
+#include "../build/win32/dirent/wdirent.c"
+#endif
+
 struct _GDir
 {
 #ifdef G_OS_WIN32