diff --git a/hphp/compiler/package.cpp b/hphp/compiler/package.cpp
index 9a43f225d22a7..b14839a970b76 100644
--- a/hphp/compiler/package.cpp
+++ b/hphp/compiler/package.cpp
@@ -18,7 +18,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <dirent.h>
 #include <fstream>
 #include <map>
 #include <memory>
@@ -26,6 +25,7 @@
 #include <utility>
 #include <vector>
 #include <folly/String.h>
+#include <folly/portability/Dirent.h>
 #include "hphp/compiler/analysis/analysis_result.h"
 #include "hphp/compiler/parser/parser.h"
 #include "hphp/compiler/analysis/symbol_table.h"
diff --git a/hphp/runtime/base/directory.h b/hphp/runtime/base/directory.h
index b19ebf8072ded..1b92efd117e1b 100644
--- a/hphp/runtime/base/directory.h
+++ b/hphp/runtime/base/directory.h
@@ -22,9 +22,10 @@
 #include "hphp/runtime/base/type-array.h"
 #include "hphp/runtime/base/type-string.h"
 
-#include <dirent.h>
 #include <vector>
 
+#include <folly/portability/Dirent.h>
+
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
diff --git a/hphp/runtime/base/file-util.cpp b/hphp/runtime/base/file-util.cpp
index 51ed91241d657..6f5364b1ff171 100644
--- a/hphp/runtime/base/file-util.cpp
+++ b/hphp/runtime/base/file-util.cpp
@@ -21,12 +21,12 @@
 #include <boost/filesystem.hpp>
 
 #include <sys/types.h>
-#include <dirent.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <libgen.h>
 
 #include <folly/String.h>
+#include <folly/portability/Dirent.h>
 
 #include "hphp/runtime/base/runtime-error.h"
 #include "hphp/util/lock.h"
diff --git a/hphp/runtime/ext/session/ext_session.cpp b/hphp/runtime/ext/session/ext_session.cpp
index cecdac0224816..c0d05b500cd71 100644
--- a/hphp/runtime/ext/session/ext_session.cpp
+++ b/hphp/runtime/ext/session/ext_session.cpp
@@ -21,10 +21,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <dirent.h>
 #include <vector>
 
 #include <folly/String.h>
+#include <folly/portability/Dirent.h>
 #include <folly/portability/SysFile.h>
 #include <folly/portability/SysTime.h>
 
diff --git a/hphp/runtime/ext/std/ext_std_file.cpp b/hphp/runtime/ext/std/ext_std_file.cpp
index 964f938040456..a1c164b907528 100644
--- a/hphp/runtime/ext/std/ext_std_file.cpp
+++ b/hphp/runtime/ext/std/ext_std_file.cpp
@@ -47,9 +47,9 @@
 #include "hphp/util/process.h"
 
 #include <folly/String.h>
+#include <folly/portability/Dirent.h>
 #include <folly/portability/SysFile.h>
 
-#include <dirent.h>
 #include <glob.h>
 #include <sys/types.h>
 #if defined(__FreeBSD__) || defined(__APPLE__)
diff --git a/hphp/runtime/ext_zend_compat/php-src/main/php_reentrancy.h b/hphp/runtime/ext_zend_compat/php-src/main/php_reentrancy.h
index 7817dc4cd7490..f3dd363c8176c 100644
--- a/hphp/runtime/ext_zend_compat/php-src/main/php_reentrancy.h
+++ b/hphp/runtime/ext_zend_compat/php-src/main/php_reentrancy.h
@@ -23,10 +23,9 @@
 
 #include "php.h"
 
+#include <folly/portability/Dirent.h>
+
 #include <sys/types.h>
-#ifdef HAVE_DIRENT_H
-#include <dirent.h>
-#endif
 #include <time.h>
 
 /* currently, PHP does not check for these functions, but assumes