From: Christopher Dykes <cdykes@fb.com>
Date: Mon, 30 May 2016 23:05:19 +0000 (-0700)
Subject: Switch uses of <unistd.h> to <folly/portability/Unistd.h>
X-Git-Tag: 2016.07.26~180
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=35fcff936a0ba58986269fb05689843f99e89eb5;p=folly.git

Switch uses of <unistd.h> to <folly/portability/Unistd.h>

Summary: Diff #12 of 14.

Reviewed By: mzlee

Differential Revision: D3187000

fbshipit-source-id: ad56ca8ff20fa88949554b61545ee1bf982b0569
---

diff --git a/folly/AtomicUnorderedMap.h b/folly/AtomicUnorderedMap.h
index 34cdf859..5dc5d88f 100644
--- a/folly/AtomicUnorderedMap.h
+++ b/folly/AtomicUnorderedMap.h
@@ -22,7 +22,6 @@
 #include <system_error>
 #include <type_traits>
 #include <stdint.h>
-#include <unistd.h>
 
 #include <folly/Bits.h>
 #include <folly/Conv.h>
@@ -30,6 +29,7 @@
 #include <folly/Random.h>
 #include <folly/detail/AtomicUnorderedMapUtils.h>
 #include <folly/portability/SysMman.h>
+#include <folly/portability/Unistd.h>
 
 #include <boost/type_traits/has_trivial_destructor.hpp>
 #include <limits>
diff --git a/folly/File.cpp b/folly/File.cpp
index ad0b4475..744c0d39 100644
--- a/folly/File.cpp
+++ b/folly/File.cpp
@@ -16,7 +16,6 @@
 
 #include <folly/File.h>
 
-#include <unistd.h>
 
 #include <folly/Exception.h>
 #include <folly/FileUtil.h>
@@ -24,6 +23,7 @@
 #include <folly/ScopeGuard.h>
 #include <folly/portability/Fcntl.h>
 #include <folly/portability/SysFile.h>
+#include <folly/portability/Unistd.h>
 
 #include <system_error>
 
diff --git a/folly/File.h b/folly/File.h
index 09a3b6bf..26d158e1 100644
--- a/folly/File.h
+++ b/folly/File.h
@@ -19,12 +19,12 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #include <string>
 
 #include <folly/Portability.h>
 #include <folly/Range.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 
diff --git a/folly/FileUtil.h b/folly/FileUtil.h
index de250aef..704a4969 100644
--- a/folly/FileUtil.h
+++ b/folly/FileUtil.h
@@ -20,13 +20,13 @@
 #include <folly/Portability.h>
 #include <folly/ScopeGuard.h>
 #include <folly/portability/SysUio.h>
+#include <folly/portability/Unistd.h>
 
 #include <cassert>
 #include <limits>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include <unistd.h>
 
 namespace folly {
 
diff --git a/folly/IndexedMemPool.h b/folly/IndexedMemPool.h
index 1007eff9..bf35b559 100644
--- a/folly/IndexedMemPool.h
+++ b/folly/IndexedMemPool.h
@@ -19,11 +19,11 @@
 #include <type_traits>
 #include <stdint.h>
 #include <assert.h>
-#include <unistd.h>
 #include <boost/noncopyable.hpp>
 #include <folly/AtomicStruct.h>
 #include <folly/detail/CacheLocality.h>
 #include <folly/portability/SysMman.h>
+#include <folly/portability/Unistd.h>
 
 // Ignore shadowing warnings within this file, so includers can use -Wshadow.
 #pragma GCC diagnostic push
diff --git a/folly/MPMCQueue.h b/folly/MPMCQueue.h
index 66b76886..08b2e1b8 100644
--- a/folly/MPMCQueue.h
+++ b/folly/MPMCQueue.h
@@ -23,11 +23,11 @@
 #include <limits>
 #include <string.h>
 #include <type_traits>
-#include <unistd.h>
 
 #include <folly/Traits.h>
 #include <folly/detail/CacheLocality.h>
 #include <folly/detail/TurnSequencer.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 
diff --git a/folly/Random.cpp b/folly/Random.cpp
index f27092f2..c6b611be 100644
--- a/folly/Random.cpp
+++ b/folly/Random.cpp
@@ -17,7 +17,6 @@
 #include <folly/Random.h>
 
 #include <atomic>
-#include <unistd.h>
 #include <mutex>
 #include <random>
 #include <array>
@@ -28,6 +27,7 @@
 #include <folly/FileUtil.h>
 #include <folly/ThreadLocal.h>
 #include <folly/portability/SysTime.h>
+#include <folly/portability/Unistd.h>
 
 #ifdef _MSC_VER
 # include <wincrypt.h>
diff --git a/folly/Subprocess.cpp b/folly/Subprocess.cpp
index ad2c077d..c208de51 100644
--- a/folly/Subprocess.cpp
+++ b/folly/Subprocess.cpp
@@ -26,8 +26,6 @@
 #include <fcntl.h>
 #include <poll.h>
 
-#include <unistd.h>
-
 #include <array>
 #include <algorithm>
 #include <system_error>
@@ -43,6 +41,7 @@
 #include <folly/String.h>
 #include <folly/io/Cursor.h>
 #include <folly/portability/Environment.h>
+#include <folly/portability/Unistd.h>
 
 constexpr int kExecFailure = 127;
 constexpr int kChildFailure = 126;
diff --git a/folly/detail/AtomicUnorderedMapUtils.h b/folly/detail/AtomicUnorderedMapUtils.h
index 4142ade8..53aba01f 100644
--- a/folly/detail/AtomicUnorderedMapUtils.h
+++ b/folly/detail/AtomicUnorderedMapUtils.h
@@ -2,9 +2,9 @@
 
 #include <atomic>
 #include <stdint.h>
-#include <unistd.h>
 
 #include <folly/portability/SysMman.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly { namespace detail {
 
diff --git a/folly/detail/FileUtilDetail.h b/folly/detail/FileUtilDetail.h
index b5ae6f65..bcebc5fc 100644
--- a/folly/detail/FileUtilDetail.h
+++ b/folly/detail/FileUtilDetail.h
@@ -17,9 +17,9 @@
 #pragma once
 
 #include <cerrno>
-#include <unistd.h>
 
 #include <folly/portability/SysUio.h>
+#include <folly/portability/Unistd.h>
 
 /**
  * Helper functions and templates for FileUtil.cpp.  Declared here so
diff --git a/folly/detail/Futex.h b/folly/detail/Futex.h
index 2f9e8487..019ce79a 100644
--- a/folly/detail/Futex.h
+++ b/folly/detail/Futex.h
@@ -20,9 +20,10 @@
 #include <chrono>
 #include <limits>
 #include <assert.h>
-#include <unistd.h>
 #include <boost/noncopyable.hpp>
 
+#include <folly/portability/Unistd.h>
+
 namespace folly { namespace detail {
 
 enum class FutexResult {
diff --git a/folly/detail/MemoryIdler.cpp b/folly/detail/MemoryIdler.cpp
index bb6b6e44..4c63054d 100644
--- a/folly/detail/MemoryIdler.cpp
+++ b/folly/detail/MemoryIdler.cpp
@@ -22,12 +22,12 @@
 #include <folly/ScopeGuard.h>
 #include <folly/detail/CacheLocality.h>
 #include <folly/portability/SysMman.h>
+#include <folly/portability/Unistd.h>
 
 #include <limits.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
 #include <utility>
 
 namespace folly { namespace detail {
diff --git a/folly/detail/TurnSequencer.h b/folly/detail/TurnSequencer.h
index 6c62928b..193b40b0 100644
--- a/folly/detail/TurnSequencer.h
+++ b/folly/detail/TurnSequencer.h
@@ -19,10 +19,10 @@
 #include <algorithm>
 #include <assert.h>
 #include <limits>
-#include <unistd.h>
 
 #include <folly/detail/Futex.h>
 #include <folly/portability/Asm.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 
diff --git a/folly/experimental/EventCount.h b/folly/experimental/EventCount.h
index e45be5a5..a9feddfd 100644
--- a/folly/experimental/EventCount.h
+++ b/folly/experimental/EventCount.h
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include <unistd.h>
 #include <syscall.h>
 #include <linux/futex.h>
 #include <climits>
@@ -27,6 +26,7 @@
 #include <folly/Bits.h>
 #include <folly/Likely.h>
 #include <folly/portability/SysTime.h>
+#include <folly/portability/Unistd.h>
 
 
 namespace folly {
diff --git a/folly/experimental/LockFreeRingBuffer.h b/folly/experimental/LockFreeRingBuffer.h
index 5411112d..5ca4a7d2 100644
--- a/folly/experimental/LockFreeRingBuffer.h
+++ b/folly/experimental/LockFreeRingBuffer.h
@@ -23,10 +23,10 @@
 #include <memory>
 #include <string.h>
 #include <type_traits>
-#include <unistd.h>
 
 #include <folly/detail/TurnSequencer.h>
 #include <folly/Portability.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 namespace detail {
diff --git a/folly/experimental/TestUtil.cpp b/folly/experimental/TestUtil.cpp
index 7087c568..dc587982 100644
--- a/folly/experimental/TestUtil.cpp
+++ b/folly/experimental/TestUtil.cpp
@@ -19,7 +19,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <unistd.h>
 
 #include <boost/regex.hpp>
 #include <folly/Conv.h>
@@ -29,6 +28,7 @@
 #include <folly/Memory.h>
 #include <folly/String.h>
 #include <folly/portability/Environment.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 namespace test {
diff --git a/folly/experimental/io/AsyncIO.cpp b/folly/experimental/io/AsyncIO.cpp
index d9539340..7095d849 100644
--- a/folly/experimental/io/AsyncIO.cpp
+++ b/folly/experimental/io/AsyncIO.cpp
@@ -17,7 +17,6 @@
 #include <folly/experimental/io/AsyncIO.h>
 
 #include <sys/eventfd.h>
-#include <unistd.h>
 #include <cerrno>
 #include <ostream>
 #include <stdexcept>
@@ -30,6 +29,7 @@
 #include <folly/Format.h>
 #include <folly/Likely.h>
 #include <folly/String.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 
diff --git a/folly/experimental/io/FsUtil.cpp b/folly/experimental/io/FsUtil.cpp
index 7c385bdc..c6f75fb5 100644
--- a/folly/experimental/io/FsUtil.cpp
+++ b/folly/experimental/io/FsUtil.cpp
@@ -16,8 +16,8 @@
 
 #include <folly/experimental/io/FsUtil.h>
 
-#include <unistd.h>
 #include <folly/Exception.h>
+#include <folly/portability/Unistd.h>
 
 namespace bsys = ::boost::system;
 
diff --git a/folly/experimental/io/HugePageUtil.cpp b/folly/experimental/io/HugePageUtil.cpp
index 0eea9252..09f3c073 100644
--- a/folly/experimental/io/HugePageUtil.cpp
+++ b/folly/experimental/io/HugePageUtil.cpp
@@ -19,7 +19,6 @@
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <unistd.h>
 
 #include <iostream>
 #include <stdexcept>
@@ -33,6 +32,7 @@
 #include <folly/ScopeGuard.h>
 #include <folly/experimental/io/HugePages.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/Unistd.h>
 
 DEFINE_bool(cp, false, "Copy file");
 
diff --git a/folly/experimental/io/HugePages.h b/folly/experimental/io/HugePages.h
index 8d5619a2..04984c8e 100644
--- a/folly/experimental/io/HugePages.h
+++ b/folly/experimental/io/HugePages.h
@@ -20,7 +20,6 @@
 #include <sys/types.h>
 #include <cstddef>
 #include <string>
-#include <unistd.h>
 #include <utility>
 #include <vector>
 
@@ -28,6 +27,7 @@
 
 #include <folly/Range.h>
 #include <folly/experimental/io/FsUtil.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 
diff --git a/folly/fibers/Fiber.cpp b/folly/fibers/Fiber.cpp
index 20af5455..ea33b6bf 100644
--- a/folly/fibers/Fiber.cpp
+++ b/folly/fibers/Fiber.cpp
@@ -15,8 +15,6 @@
  */
 #include "Fiber.h"
 
-#include <unistd.h>
-
 #include <glog/logging.h>
 #include <algorithm>
 #include <cstring>
@@ -27,6 +25,7 @@
 #include <folly/fibers/BoostContextCompatibility.h>
 #include <folly/fibers/FiberManager.h>
 #include <folly/portability/SysSyscall.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 namespace fibers {
diff --git a/folly/fibers/FiberManager.cpp b/folly/fibers/FiberManager.cpp
index de552a54..99280e82 100644
--- a/folly/fibers/FiberManager.cpp
+++ b/folly/fibers/FiberManager.cpp
@@ -16,7 +16,6 @@
 #include "FiberManager.h"
 
 #include <signal.h>
-#include <unistd.h>
 
 #include <cassert>
 #include <stdexcept>
@@ -28,6 +27,7 @@
 
 #include <folly/SingletonThreadLocal.h>
 #include <folly/portability/SysSyscall.h>
+#include <folly/portability/Unistd.h>
 
 #ifdef FOLLY_SANITIZE_ADDRESS
 
diff --git a/folly/fibers/GuardPageAllocator.cpp b/folly/fibers/GuardPageAllocator.cpp
index b424e6f7..80bdbd75 100644
--- a/folly/fibers/GuardPageAllocator.cpp
+++ b/folly/fibers/GuardPageAllocator.cpp
@@ -15,13 +15,12 @@
  */
 #include "GuardPageAllocator.h"
 
-#include <unistd.h>
-
 #include <mutex>
 
 #include <folly/Singleton.h>
 #include <folly/SpinLock.h>
 #include <folly/portability/SysMman.h>
+#include <folly/portability/Unistd.h>
 
 #include <glog/logging.h>
 
diff --git a/folly/futures/test/FutureTest.cpp b/folly/futures/test/FutureTest.cpp
index 8414370c..18fca468 100644
--- a/folly/futures/test/FutureTest.cpp
+++ b/folly/futures/test/FutureTest.cpp
@@ -22,6 +22,7 @@
 #include <folly/Executor.h>
 #include <folly/dynamic.h>
 #include <folly/Baton.h>
+#include <folly/portability/Unistd.h>
 
 #include <algorithm>
 #include <atomic>
@@ -30,7 +31,6 @@
 #include <string>
 #include <thread>
 #include <type_traits>
-#include <unistd.h>
 
 using namespace folly;
 
diff --git a/folly/futures/test/TimekeeperTest.cpp b/folly/futures/test/TimekeeperTest.cpp
index b64a5636..c20668c0 100644
--- a/folly/futures/test/TimekeeperTest.cpp
+++ b/folly/futures/test/TimekeeperTest.cpp
@@ -17,8 +17,7 @@
 #include <gtest/gtest.h>
 
 #include <folly/futures/Timekeeper.h>
-
-#include <unistd.h>
+#include <folly/portability/Unistd.h>
 
 using namespace folly;
 using std::chrono::milliseconds;
diff --git a/folly/gen/test/ParallelMapBenchmark.cpp b/folly/gen/test/ParallelMapBenchmark.cpp
index 86f3a9f2..027fe9f0 100644
--- a/folly/gen/test/ParallelMapBenchmark.cpp
+++ b/folly/gen/test/ParallelMapBenchmark.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <unistd.h>
 #include <atomic>
 #include <algorithm>
 #include <thread>
@@ -23,6 +22,7 @@
 #include <folly/Benchmark.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/ParallelMap.h>
+#include <folly/portability/Unistd.h>
 
 using namespace folly::gen;
 
diff --git a/folly/io/RecordIO.cpp b/folly/io/RecordIO.cpp
index d889e806..f279ae47 100644
--- a/folly/io/RecordIO.cpp
+++ b/folly/io/RecordIO.cpp
@@ -17,7 +17,6 @@
 #include <folly/io/RecordIO.h>
 
 #include <sys/types.h>
-#include <unistd.h>
 
 #include <folly/Exception.h>
 #include <folly/FileUtil.h>
@@ -25,6 +24,7 @@
 #include <folly/Portability.h>
 #include <folly/ScopeGuard.h>
 #include <folly/String.h>
+#include <folly/portability/Unistd.h>
 
 namespace folly {
 
diff --git a/folly/io/async/AsyncSSLSocket.cpp b/folly/io/async/AsyncSSLSocket.cpp
index 2146d6b9..c972c877 100644
--- a/folly/io/async/AsyncSSLSocket.cpp
+++ b/folly/io/async/AsyncSSLSocket.cpp
@@ -28,7 +28,6 @@
 #include <openssl/ssl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <unistd.h>
 #include <chrono>
 
 #include <folly/Bits.h>
@@ -36,6 +35,7 @@
 #include <folly/SpinLock.h>
 #include <folly/io/IOBuf.h>
 #include <folly/io/Cursor.h>
+#include <folly/portability/Unistd.h>
 
 using folly::SocketAddress;
 using folly::SSLContext;
diff --git a/folly/io/async/AsyncServerSocket.cpp b/folly/io/async/AsyncServerSocket.cpp
index f28bbc31..5d15ff49 100644
--- a/folly/io/async/AsyncServerSocket.cpp
+++ b/folly/io/async/AsyncServerSocket.cpp
@@ -26,13 +26,13 @@
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/NotificationQueue.h>
 #include <folly/portability/Fcntl.h>
+#include <folly/portability/Unistd.h>
 
 #include <errno.h>
 #include <netinet/tcp.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 namespace folly {
 
diff --git a/folly/io/async/AsyncSocket.cpp b/folly/io/async/AsyncSocket.cpp
index 3424eb98..c35d7b47 100644
--- a/folly/io/async/AsyncSocket.cpp
+++ b/folly/io/async/AsyncSocket.cpp
@@ -22,11 +22,11 @@
 #include <folly/io/IOBuf.h>
 #include <folly/portability/Fcntl.h>
 #include <folly/portability/SysUio.h>
+#include <folly/portability/Unistd.h>
 
 #include <poll.h>
 #include <errno.h>
 #include <limits.h>
-#include <unistd.h>
 #include <thread>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/folly/io/async/AsyncUDPSocket.cpp b/folly/io/async/AsyncUDPSocket.cpp
index d7e9f03b..236e60e6 100644
--- a/folly/io/async/AsyncUDPSocket.cpp
+++ b/folly/io/async/AsyncUDPSocket.cpp
@@ -19,9 +19,9 @@
 #include <folly/io/async/EventBase.h>
 #include <folly/Likely.h>
 #include <folly/portability/Fcntl.h>
+#include <folly/portability/Unistd.h>
 
 #include <errno.h>
-#include <unistd.h>
 
 // Due to the way kernel headers are included, this may or may not be defined.
 // Number pulled from 3.10 kernel headers.
diff --git a/folly/io/async/EventBase.cpp b/folly/io/async/EventBase.cpp
index 0987f1fa..2680d96c 100644
--- a/folly/io/async/EventBase.cpp
+++ b/folly/io/async/EventBase.cpp
@@ -22,12 +22,12 @@
 
 #include <folly/ThreadName.h>
 #include <folly/io/async/NotificationQueue.h>
+#include <folly/portability/Unistd.h>
 
 #include <condition_variable>
 #include <fcntl.h>
 #include <mutex>
 #include <pthread.h>
-#include <unistd.h>
 
 namespace {
 
diff --git a/folly/io/async/NotificationQueue.h b/folly/io/async/NotificationQueue.h
index 86a2b95b..0f26d88d 100644
--- a/folly/io/async/NotificationQueue.h
+++ b/folly/io/async/NotificationQueue.h
@@ -18,7 +18,6 @@
 
 #include <poll.h>
 #include <sys/types.h>
-#include <unistd.h>
 
 #include <algorithm>
 #include <deque>
@@ -36,6 +35,7 @@
 #include <folly/ScopeGuard.h>
 #include <folly/SpinLock.h>
 #include <folly/portability/Fcntl.h>
+#include <folly/portability/Unistd.h>
 
 #include <glog/logging.h>
 
diff --git a/folly/io/async/test/AsyncSSLSocketTest.cpp b/folly/io/async/test/AsyncSSLSocketTest.cpp
index e946d6e6..2e5f2462 100644
--- a/folly/io/async/test/AsyncSSLSocketTest.cpp
+++ b/folly/io/async/test/AsyncSSLSocketTest.cpp
@@ -21,6 +21,7 @@
 #include <folly/io/async/AsyncSSLSocket.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/SocketAddress.h>
+#include <folly/portability/Unistd.h>
 
 #include <folly/io/async/test/BlockingSocket.h>
 
@@ -29,7 +30,6 @@
 #include <iostream>
 #include <list>
 #include <set>
-#include <unistd.h>
 #include <fcntl.h>
 #include <openssl/bio.h>
 #include <poll.h>
diff --git a/folly/io/async/test/AsyncSSLSocketTest.h b/folly/io/async/test/AsyncSSLSocketTest.h
index 69966d67..5c0fe437 100644
--- a/folly/io/async/test/AsyncSSLSocketTest.h
+++ b/folly/io/async/test/AsyncSSLSocketTest.h
@@ -27,11 +27,11 @@
 #include <folly/io/async/AsyncTransport.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/io/async/ssl/SSLErrors.h>
+#include <folly/portability/Unistd.h>
 
 #include <gtest/gtest.h>
 #include <iostream>
 #include <list>
-#include <unistd.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/types.h>
diff --git a/folly/io/async/test/AsyncSocketTest2.cpp b/folly/io/async/test/AsyncSocketTest2.cpp
index 4f9bd3a2..927d74f7 100644
--- a/folly/io/async/test/AsyncSocketTest2.cpp
+++ b/folly/io/async/test/AsyncSocketTest2.cpp
@@ -24,12 +24,12 @@
 #include <folly/io/IOBuf.h>
 #include <folly/io/async/test/AsyncSocketTest.h>
 #include <folly/io/async/test/Util.h>
+#include <folly/portability/Unistd.h>
 #include <folly/test/SocketAddressTestHelper.h>
 
 #include <gtest/gtest.h>
 #include <boost/scoped_array.hpp>
 #include <iostream>
-#include <unistd.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/types.h>
diff --git a/folly/io/async/test/EventBaseTest.cpp b/folly/io/async/test/EventBaseTest.cpp
index 46840882..bc8988ab 100644
--- a/folly/io/async/test/EventBaseTest.cpp
+++ b/folly/io/async/test/EventBaseTest.cpp
@@ -23,10 +23,10 @@
 #include <folly/io/async/EventHandler.h>
 #include <folly/io/async/test/SocketPair.h>
 #include <folly/io/async/test/Util.h>
+#include <folly/portability/Unistd.h>
 
 #include <atomic>
 #include <iostream>
-#include <unistd.h>
 #include <memory>
 #include <thread>
 
diff --git a/folly/io/async/test/SocketPair.cpp b/folly/io/async/test/SocketPair.cpp
index 73df89b7..eff35d76 100644
--- a/folly/io/async/test/SocketPair.cpp
+++ b/folly/io/async/test/SocketPair.cpp
@@ -19,8 +19,8 @@
 #include <folly/io/async/test/SocketPair.h>
 
 #include <folly/Conv.h>
+#include <folly/portability/Unistd.h>
 
-#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/types.h>
diff --git a/folly/io/async/test/TimeUtil.cpp b/folly/io/async/test/TimeUtil.cpp
index 006c9ca6..8103fcc5 100644
--- a/folly/io/async/test/TimeUtil.cpp
+++ b/folly/io/async/test/TimeUtil.cpp
@@ -21,6 +21,7 @@
 
 #include <folly/Conv.h>
 #include <folly/portability/SysSyscall.h>
+#include <folly/portability/Unistd.h>
 
 #include <chrono>
 #include <sys/types.h>
@@ -29,7 +30,6 @@
 #include <errno.h>
 #include <glog/logging.h>
 #include <fcntl.h>
-#include <unistd.h>
 #include <stdio.h>
 #include <stdexcept>
 
diff --git a/folly/io/test/RecordIOTest.cpp b/folly/io/test/RecordIOTest.cpp
index e18fd262..9154b8ac 100644
--- a/folly/io/test/RecordIOTest.cpp
+++ b/folly/io/test/RecordIOTest.cpp
@@ -17,7 +17,7 @@
 #include <folly/io/RecordIO.h>
 
 #include <sys/types.h>
-#include <unistd.h>
+
 #include <random>
 
 #include <glog/logging.h>
@@ -29,6 +29,7 @@
 #include <folly/experimental/TestUtil.h>
 #include <folly/io/IOBufQueue.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/Unistd.h>
 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");
 
diff --git a/folly/test/IndexedMemPoolTest.cpp b/folly/test/IndexedMemPoolTest.cpp
index 5c7a9733..91c24805 100644
--- a/folly/test/IndexedMemPoolTest.cpp
+++ b/folly/test/IndexedMemPoolTest.cpp
@@ -16,9 +16,9 @@
 
 #include <folly/IndexedMemPool.h>
 #include <folly/test/DeterministicSchedule.h>
+#include <folly/portability/Unistd.h>
 #include <string>
 #include <thread>
-#include <unistd.h>
 #include <semaphore.h>
 #include <gtest/gtest.h>
 
diff --git a/folly/test/MPMCQueueTest.cpp b/folly/test/MPMCQueueTest.cpp
index 93c7d3d5..25b85a92 100644
--- a/folly/test/MPMCQueueTest.cpp
+++ b/folly/test/MPMCQueueTest.cpp
@@ -19,6 +19,7 @@
 #include <folly/Memory.h>
 #include <folly/portability/SysResource.h>
 #include <folly/portability/SysTime.h>
+#include <folly/portability/Unistd.h>
 #include <folly/test/DeterministicSchedule.h>
 
 #include <boost/intrusive_ptr.hpp>
@@ -26,7 +27,6 @@
 #include <functional>
 #include <thread>
 #include <utility>
-#include <unistd.h>
 
 #include <gtest/gtest.h>
 
diff --git a/folly/test/RWSpinLockTest.cpp b/folly/test/RWSpinLockTest.cpp
index 18011e1a..a6a40415 100644
--- a/folly/test/RWSpinLockTest.cpp
+++ b/folly/test/RWSpinLockTest.cpp
@@ -21,7 +21,6 @@
 #include <folly/RWSpinLock.h>
 
 #include <stdlib.h>
-#include <unistd.h>
 #include <vector>
 #include <thread>
 
@@ -29,6 +28,7 @@
 #include <gtest/gtest.h>
 
 #include <folly/portability/GFlags.h>
+#include <folly/portability/Unistd.h>
 
 DEFINE_int32(num_threads, 8, "num threads");
 
diff --git a/folly/test/SubprocessTest.cpp b/folly/test/SubprocessTest.cpp
index 0b0bb9ae..e91dd3a8 100644
--- a/folly/test/SubprocessTest.cpp
+++ b/folly/test/SubprocessTest.cpp
@@ -16,7 +16,6 @@
 
 #include <folly/Subprocess.h>
 
-#include <unistd.h>
 #include <sys/types.h>
 
 #include <boost/container/flat_set.hpp>
@@ -33,6 +32,7 @@
 #include <folly/experimental/TestUtil.h>
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/portability/Dirent.h>
+#include <folly/portability/Unistd.h>
 
 using namespace folly;
 
diff --git a/folly/test/SubprocessTestParentDeathHelper.cpp b/folly/test/SubprocessTestParentDeathHelper.cpp
index 7ade0795..68a601d9 100644
--- a/folly/test/SubprocessTestParentDeathHelper.cpp
+++ b/folly/test/SubprocessTestParentDeathHelper.cpp
@@ -26,13 +26,13 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <unistd.h>
 
 #include <glog/logging.h>
 
 #include <folly/Conv.h>
 #include <folly/Subprocess.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/Unistd.h>
 
 using folly::Subprocess;
 
diff --git a/folly/test/ThreadLocalBenchmark.cpp b/folly/test/ThreadLocalBenchmark.cpp
index 6009cc6a..a3ea1e53 100644
--- a/folly/test/ThreadLocalBenchmark.cpp
+++ b/folly/test/ThreadLocalBenchmark.cpp
@@ -19,7 +19,6 @@
 #include <dlfcn.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 
 #include <array>
 #include <atomic>
@@ -38,6 +37,7 @@
 #include <folly/Benchmark.h>
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/portability/GFlags.h>
+#include <folly/portability/Unistd.h>
 
 using namespace folly;
 
diff --git a/folly/test/ThreadLocalTest.cpp b/folly/test/ThreadLocalTest.cpp
index f9cd3f3f..230aaa33 100644
--- a/folly/test/ThreadLocalTest.cpp
+++ b/folly/test/ThreadLocalTest.cpp
@@ -19,7 +19,6 @@
 #include <dlfcn.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <unistd.h>
 
 #include <array>
 #include <atomic>
@@ -38,6 +37,7 @@
 #include <folly/Baton.h>
 #include <folly/Memory.h>
 #include <folly/experimental/io/FsUtil.h>
+#include <folly/portability/Unistd.h>
 
 using namespace folly;