diff --git a/thrift/lib/cpp/TLogging.h b/thrift/lib/cpp/TLogging.h
index 3e41c0c5c16..9a43a354418 100644
--- a/thrift/lib/cpp/TLogging.h
+++ b/thrift/lib/cpp/TLogging.h
@@ -31,7 +31,7 @@
  */
 
 #ifdef THRIFT_HAVE_CLOCK_GETTIME
-#include <sys/time.h>
+#include <folly/portability/SysTime.h>
 #endif
 #include <time.h>
 
diff --git a/thrift/lib/cpp/concurrency/Util.cpp b/thrift/lib/cpp/concurrency/Util.cpp
index 0bf903a0b99..62ce643456c 100644
--- a/thrift/lib/cpp/concurrency/Util.cpp
+++ b/thrift/lib/cpp/concurrency/Util.cpp
@@ -24,7 +24,7 @@
 #if defined(THRIFT_HAVE_CLOCK_GETTIME)
 #include <time.h>
 #elif defined(THRIFT_HAVE_GETTIMEOFDAY)
-#include <sys/time.h>
+#include <folly/portability/SysTime.h>
 #endif // defined(THRIFT_HAVE_CLOCK_GETTIME)
 #include <errno.h>
 #include <assert.h>
diff --git a/thrift/lib/cpp/concurrency/Util.h b/thrift/lib/cpp/concurrency/Util.h
index f38595a2c12..190d9f71246 100644
--- a/thrift/lib/cpp/concurrency/Util.h
+++ b/thrift/lib/cpp/concurrency/Util.h
@@ -24,9 +24,10 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <time.h>
-#include <sys/time.h>
 #include <chrono>
 
+#include <folly/portability/SysTime.h>
+
 namespace apache { namespace thrift { namespace concurrency {
 
 /**
diff --git a/thrift/lib/cpp/concurrency/test/ThreadManagerTests.cpp b/thrift/lib/cpp/concurrency/test/ThreadManagerTests.cpp
index ef5de9b3f9b..c23b6de517d 100644
--- a/thrift/lib/cpp/concurrency/test/ThreadManagerTests.cpp
+++ b/thrift/lib/cpp/concurrency/test/ThreadManagerTests.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <sys/time.h>
 #include <sys/resource.h>
 #include <numa.h>
 
@@ -26,6 +25,7 @@
 #include <thread>
 
 #include <folly/Synchronized.h>
+#include <folly/portability/SysTime.h>
 #include <gtest/gtest.h>
 #include <thrift/lib/cpp/concurrency/FunctionRunner.h>
 #include <thrift/lib/cpp/concurrency/Monitor.h>
diff --git a/thrift/lib/cpp/server/TServer.cpp b/thrift/lib/cpp/server/TServer.cpp
index a7cd6075844..85247a5208b 100644
--- a/thrift/lib/cpp/server/TServer.cpp
+++ b/thrift/lib/cpp/server/TServer.cpp
@@ -19,10 +19,11 @@
 
 #include <thrift/lib/cpp/server/TServer.h>
 
-#include <sys/time.h>
 #include <sys/resource.h>
 #include <unistd.h>
 
+#include <folly/portability/SysTime.h>
+
 namespace apache { namespace thrift { namespace server {
 
 int increase_max_fds(int max_fds)  {
diff --git a/thrift/lib/cpp/transport/TFDTransport.h b/thrift/lib/cpp/transport/TFDTransport.h
index 8a0a14ba0b8..e955992e3cd 100644
--- a/thrift/lib/cpp/transport/TFDTransport.h
+++ b/thrift/lib/cpp/transport/TFDTransport.h
@@ -21,7 +21,8 @@
 #define _THRIFT_TRANSPORT_TFDTRANSPORT_H_ 1
 
 #include <string>
-#include <sys/time.h>
+
+#include <folly/portability/SysTime.h>
 
 #include <thrift/lib/cpp/transport/TTransport.h>
 #include <thrift/lib/cpp/transport/TVirtualTransport.h>
diff --git a/thrift/lib/cpp/transport/TFileTransport.cpp b/thrift/lib/cpp/transport/TFileTransport.cpp
index 0e2222c068b..9ea8784769c 100644
--- a/thrift/lib/cpp/transport/TFileTransport.cpp
+++ b/thrift/lib/cpp/transport/TFileTransport.cpp
@@ -24,11 +24,7 @@
 #include <thrift/lib/cpp/TProcessor.h>
 
 #include <pthread.h>
-#ifdef THRIFT_HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
 #include <time.h>
-#endif
 #include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
@@ -40,6 +36,8 @@
 #include <iostream>
 #include <sys/stat.h>
 
+#include <folly/portability/SysTime.h>
+
 namespace apache { namespace thrift { namespace transport {
 
 using boost::scoped_ptr;
diff --git a/thrift/lib/cpp/transport/TSocket.h b/thrift/lib/cpp/transport/TSocket.h
index fae5a914cd7..3382bf91578 100644
--- a/thrift/lib/cpp/transport/TSocket.h
+++ b/thrift/lib/cpp/transport/TSocket.h
@@ -18,11 +18,11 @@
 #define _THRIFT_TRANSPORT_TSOCKET_H_ 1
 
 #include <string>
-#include <sys/time.h>
 
 #include <thrift/lib/cpp/transport/TRpcTransport.h>
 #include <thrift/lib/cpp/transport/TVirtualTransport.h>
 #include <folly/SocketAddress.h>
+#include <folly/portability/SysTime.h>
 
 namespace apache { namespace thrift { namespace transport {
 
diff --git a/thrift/lib/cpp/util/PausableTimer.cpp b/thrift/lib/cpp/util/PausableTimer.cpp
index 8a5cc2ce54c..ee10f839ea8 100644
--- a/thrift/lib/cpp/util/PausableTimer.cpp
+++ b/thrift/lib/cpp/util/PausableTimer.cpp
@@ -17,7 +17,8 @@
 #include <thrift/lib/cpp/util/PausableTimer.h>
 
 #include <stdint.h>
-#include <sys/time.h>
+
+#include <folly/portability/SysTime.h>
 
 namespace apache { namespace thrift { namespace util {
 
diff --git a/thrift/lib/cpp/util/PausableTimer.h b/thrift/lib/cpp/util/PausableTimer.h
index 8135c2e4a09..3e63b2dc81e 100644
--- a/thrift/lib/cpp/util/PausableTimer.h
+++ b/thrift/lib/cpp/util/PausableTimer.h
@@ -17,9 +17,10 @@
 #pragma once
 
 #include <stdint.h>
-#include <sys/time.h>
 #include <sys/types.h>
 
+#include <folly/portability/SysTime.h>
+
 namespace apache { namespace thrift { namespace util {
 
 class PausableTimer {
diff --git a/thrift/test/Benchmark.cpp b/thrift/test/Benchmark.cpp
index cf19e7dc074..de78fb31dd5 100644
--- a/thrift/test/Benchmark.cpp
+++ b/thrift/test/Benchmark.cpp
@@ -24,7 +24,8 @@
 #include <thrift/lib/cpp/protocol/THeaderProtocol.h>
 #include <thrift/test/gen-cpp/DebugProtoTest_types.h>
 #include <time.h>
-#include <sys/time.h>
+
+#include <folly/portability/SysTime.h>
 
 class Timer {
 public:
diff --git a/thrift/test/TFileTransportTest.cpp b/thrift/test/TFileTransportTest.cpp
index 29cc1524df6..0d062187e57 100644
--- a/thrift/test/TFileTransportTest.cpp
+++ b/thrift/test/TFileTransportTest.cpp
@@ -24,12 +24,12 @@
 #include <getopt.h>
 #include <gtest/gtest.h>
 #include <glog/logging.h>
-#include <sys/time.h>
 
 #include <thrift/lib/cpp/concurrency/Mutex.h>
 #include <thrift/lib/cpp/concurrency/Util.h>
 #include <thrift/lib/cpp/transport/TFileTransport.h>
 #include <folly/io/async/test/Util.h>
+#include <folly/portability/SysTime.h>
 
 using apache::thrift::concurrency::Guard;
 using apache::thrift::concurrency::Mutex;
diff --git a/thrift/test/THeaderTest.cpp b/thrift/test/THeaderTest.cpp
index 95ccd3c2718..4096f6d51e5 100644
--- a/thrift/test/THeaderTest.cpp
+++ b/thrift/test/THeaderTest.cpp
@@ -17,7 +17,6 @@
 #include <memory>
 #include <stdio.h>
 #include <iostream>
-#include <sys/time.h>
 #include <unistd.h>
 
 #include <thrift/lib/cpp/async/TEventServer.h>
@@ -47,6 +46,8 @@
 
 #include <thrift/test/gen-cpp/Service.h>
 
+#include <folly/portability/SysTime.h>
+
 #include <gtest/gtest.h>
 
 using namespace std;
diff --git a/thrift/test/cpp/src/TestClient.cpp b/thrift/test/cpp/src/TestClient.cpp
index 6144c34d70f..d8d5c88cb50 100644
--- a/thrift/test/cpp/src/TestClient.cpp
+++ b/thrift/test/cpp/src/TestClient.cpp
@@ -20,7 +20,6 @@
 #define __STDC_FORMAT_MACROS
 #include <stdio.h>
 #include <unistd.h>
-#include <sys/time.h>
 #include <thrift/lib/cpp/protocol/TBinaryProtocol.h>
 #include <thrift/lib/cpp/protocol/THeaderProtocol.h>
 #include <thrift/lib/cpp/transport/TTransportUtils.h>
@@ -30,6 +29,8 @@
 #include <memory>
 #include <thrift/test/gen-cpp/ThriftTest.h>
 
+#include <folly/portability/SysTime.h>
+
 #include <inttypes.h>
 
 using std::string;