diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 8b0d672e97d..96924506cf2 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -33,7 +33,9 @@
 # include <sys/mman.h>
 #endif
 #include <string.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 
diff --git a/dlls/kernel32/oldconfig.c b/dlls/kernel32/oldconfig.c
index 09e407b59d5..ee41d813143 100644
--- a/dlls/kernel32/oldconfig.c
+++ b/dlls/kernel32/oldconfig.c
@@ -32,7 +32,9 @@
 # include <sys/stat.h>
 #endif
 #include <fcntl.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
index 0e99c4f6661..dee0ce6ea5b 100644
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -24,7 +24,9 @@
 #include "wine/port.h"
 
 #include <sys/types.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c
index 6e41eb5d87d..62ccc2c650b 100644
--- a/dlls/ntdll/server.c
+++ b/dlls/ntdll/server.c
@@ -23,7 +23,9 @@
 
 #include <assert.h>
 #include <ctype.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
diff --git a/dlls/shell32/shfldr_unixfs.c b/dlls/shell32/shfldr_unixfs.c
index 332dd45a3b9..b612ef78b72 100644
--- a/dlls/shell32/shfldr_unixfs.c
+++ b/dlls/shell32/shfldr_unixfs.c
@@ -128,7 +128,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <limits.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c
index 2762f047aaa..a366f625ca7 100644
--- a/dlls/shell32/trash.c
+++ b/dlls/shell32/trash.c
@@ -30,7 +30,9 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 
 #include "windef.h"
 #include "winbase.h"
diff --git a/dlls/wineps.drv/mkagl.c b/dlls/wineps.drv/mkagl.c
index 3606fe675a1..db789f1b37b 100644
--- a/dlls/wineps.drv/mkagl.c
+++ b/dlls/wineps.drv/mkagl.c
@@ -16,8 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include "config.h"
+
 #include <sys/types.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/dlls/wineps.drv/truetype.c b/dlls/wineps.drv/truetype.c
index 0254a75f482..b5269590da1 100644
--- a/dlls/wineps.drv/truetype.c
+++ b/dlls/wineps.drv/truetype.c
@@ -59,7 +59,9 @@
 #endif
 
 #include <sys/types.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 #include <string.h>
 #include <stdarg.h>
 #include <stdio.h>
diff --git a/dlls/wineps.drv/type1afm.c b/dlls/wineps.drv/type1afm.c
index dd7e0ce3176..85aca4262be 100644
--- a/dlls/wineps.drv/type1afm.c
+++ b/dlls/wineps.drv/type1afm.c
@@ -32,7 +32,9 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
-#include <dirent.h>
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
 #include <errno.h>
 #include <ctype.h>
 #include <limits.h> 	    /* INT_MIN */