From 4598dd7067fb84d53913acaf80d0df585ba4d0f7 Mon Sep 17 00:00:00 2001
From: Michael Lee <mzlee@fb.com>
Date: Wed, 4 May 2016 17:08:47 -0700
Subject: [PATCH] Switch gflags to portability/GFlags.h

Summary:
There are two places that still includes gflags/gflags.h:
portability/GFlags.h and futures/exercises/Koan.h. Also removing
gflags entirely from a couple of places which never reference it at
all.

Reviewed By: yfeldblum

Differential Revision: D3203187

fb-gh-sync-id: e7725fbf2c4b3c475c0035e1b0e8c6e1227f277f
fbshipit-source-id: e7725fbf2c4b3c475c0035e1b0e8c6e1227f277f
---
 folly/MemoryMapping.cpp                         |  2 +-
 folly/build/GenerateFingerprintTables.cpp       |  2 +-
 folly/experimental/ProgramOptions.cpp           |  3 ++-
 folly/experimental/ProgramOptions.h             |  3 ++-
 .../ExceptionTracerBenchmark.cpp                |  2 +-
 folly/experimental/io/HugePageUtil.cpp          |  3 +--
 folly/experimental/symbolizer/ElfUtil.cpp       |  3 ++-
 .../symbolizer/test/DwarfBenchmark.cpp          |  2 +-
 .../test/LockFreeRingBufferTest.cpp             |  1 -
 .../test/NestedCommandLineAppTestHelper.cpp     |  2 +-
 .../test/ReadMostlySharedPtrBenchmark.cpp       |  9 +++++----
 folly/experimental/test/StringKeyedTest.cpp     | 17 +++++++++--------
 folly/init/Init.cpp                             |  8 +++++---
 folly/io/async/test/EventBaseBenchmark.cpp      |  3 +--
 folly/io/test/IOBufQueueTest.cpp                |  8 ++++----
 folly/io/test/IOBufTest.cpp                     |  5 ++---
 folly/io/test/NetworkBenchmark.cpp              |  7 +++----
 folly/io/test/RecordIOTest.cpp                  |  3 +--
 folly/portability/GFlags.h                      |  8 +++++---
 folly/test/AsciiCaseInsensitiveTest.cpp         |  2 +-
 folly/test/AtomicUnorderedMapTest.cpp           | 12 ++++++++----
 folly/test/BatonBenchmark.cpp                   | 11 +++++++----
 folly/test/BitIteratorTest.cpp                  |  5 +++--
 folly/test/ChecksumTest.cpp                     |  4 +++-
 folly/test/ConcurrentSkipListBenchmark.cpp      |  5 ++---
 folly/test/ConcurrentSkipListTest.cpp           |  8 ++++----
 folly/test/DeterministicScheduleTest.cpp        |  3 ++-
 folly/test/DynamicOtherTest.cpp                 |  2 +-
 folly/test/ExceptionWrapperBenchmark.cpp        |  4 ++--
 folly/test/FBStringBenchmark.cpp                |  7 +++----
 folly/test/FBVectorBenchmark.cpp                | 11 +++++------
 folly/test/FileLockTest.cpp                     | 13 ++++++-------
 folly/test/FileTestLockHelper.cpp               |  2 +-
 folly/test/FormatOtherTest.cpp                  |  7 +++----
 folly/test/HashBenchmark.cpp                    |  9 +++++----
 folly/test/HistogramBenchmark.cpp               |  3 +--
 folly/test/HistogramTest.cpp                    |  1 -
 folly/test/JsonOtherTest.cpp                    |  2 +-
 folly/test/LifoSemTests.cpp                     |  7 ++++---
 folly/test/ProducerConsumerQueueBenchmark.cpp   |  6 +++---
 folly/test/ProducerConsumerQueueTest.cpp        |  5 +++--
 folly/test/RWSpinLockTest.cpp                   | 12 +++++-------
 folly/test/SharedMutexTest.cpp                  | 11 ++++++-----
 folly/test/SingletonBenchmark.cpp               |  9 +++++----
 folly/test/SparseByteSetBench.cpp               |  8 ++++----
 folly/test/SparseByteSetTest.cpp                |  4 +++-
 folly/test/SubprocessTestParentDeathHelper.cpp  |  2 +-
 folly/test/ThreadCachedIntTest.cpp              |  8 +++++---
 folly/test/ThreadLocalBenchmark.cpp             |  2 +-
 folly/test/function_benchmark/main.cpp          |  5 +++--
 folly/test/stl_tests/StlVectorTest.cpp          | 11 ++++++-----
 51 files changed, 154 insertions(+), 138 deletions(-)

diff --git a/folly/MemoryMapping.cpp b/folly/MemoryMapping.cpp
index 17f1e760..f6c3be9c 100644
--- a/folly/MemoryMapping.cpp
+++ b/folly/MemoryMapping.cpp
@@ -21,6 +21,7 @@
 #include <utility>
 
 #include <folly/Format.h>
+#include <folly/portability/GFlags.h>
 #include <folly/portability/SysMman.h>
 
 #ifdef __linux__
@@ -30,7 +31,6 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <system_error>
-#include <gflags/gflags.h>
 
 DEFINE_int64(mlock_chunk_size, 1 << 20,  // 1MB
              "Maximum bytes to mlock/munlock/munmap at once "
diff --git a/folly/build/GenerateFingerprintTables.cpp b/folly/build/GenerateFingerprintTables.cpp
index e0fcc0e4..3ab74acb 100644
--- a/folly/build/GenerateFingerprintTables.cpp
+++ b/folly/build/GenerateFingerprintTables.cpp
@@ -24,9 +24,9 @@
 #include <string>
 
 #include <glog/logging.h>
-#include <gflags/gflags.h>
 
 #include <folly/Format.h>
+#include <folly/portability/GFlags.h>
 
 #include <folly/detail/FingerprintPolynomial.h>
 
diff --git a/folly/experimental/ProgramOptions.cpp b/folly/experimental/ProgramOptions.cpp
index d3bf8369..9e988514 100644
--- a/folly/experimental/ProgramOptions.cpp
+++ b/folly/experimental/ProgramOptions.cpp
@@ -20,10 +20,11 @@
 #include <unordered_set>
 
 #include <boost/version.hpp>
-#include <gflags/gflags.h>
 #include <glog/logging.h>
+
 #include <folly/Conv.h>
 #include <folly/Portability.h>
+#include <folly/portability/GFlags.h>
 
 namespace po = ::boost::program_options;
 
diff --git a/folly/experimental/ProgramOptions.h b/folly/experimental/ProgramOptions.h
index b51b9899..f128ed7a 100644
--- a/folly/experimental/ProgramOptions.h
+++ b/folly/experimental/ProgramOptions.h
@@ -17,8 +17,9 @@
 #pragma once
 
 #include <boost/program_options.hpp>
+
 #include <folly/Optional.h>
-#include <gflags/gflags.h>
+#include <folly/portability/GFlags.h>
 
 namespace folly {
 
diff --git a/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp b/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp
index 61ad1af9..dd4a04b6 100644
--- a/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp
+++ b/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp
@@ -18,11 +18,11 @@
 #include <thread>
 #include <vector>
 
-#include <gflags/gflags.h>
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>
 #include <folly/experimental/exception_tracer/ExceptionTracer.h>
+#include <folly/portability/GFlags.h>
 
 void recurse(int level) {
   if (level == 0) {
diff --git a/folly/experimental/io/HugePageUtil.cpp b/folly/experimental/io/HugePageUtil.cpp
index d3ba4b52..0eea9252 100644
--- a/folly/experimental/io/HugePageUtil.cpp
+++ b/folly/experimental/io/HugePageUtil.cpp
@@ -25,8 +25,6 @@
 #include <stdexcept>
 #include <system_error>
 
-#include <gflags/gflags.h>
-
 #include <folly/File.h>
 #include <folly/Format.h>
 #include <folly/MemoryMapping.h>
@@ -34,6 +32,7 @@
 #include <folly/Range.h>
 #include <folly/ScopeGuard.h>
 #include <folly/experimental/io/HugePages.h>
+#include <folly/portability/GFlags.h>
 
 DEFINE_bool(cp, false, "Copy file");
 
diff --git a/folly/experimental/symbolizer/ElfUtil.cpp b/folly/experimental/symbolizer/ElfUtil.cpp
index 03285ab4..41ca585e 100644
--- a/folly/experimental/symbolizer/ElfUtil.cpp
+++ b/folly/experimental/symbolizer/ElfUtil.cpp
@@ -19,9 +19,10 @@
 
 #include <stdio.h>
 
-#include <gflags/gflags.h>
 #include <glog/logging.h>
 
+#include <folly/portability/GFlags.h>
+
 using namespace folly;
 using namespace folly::symbolizer;
 
diff --git a/folly/experimental/symbolizer/test/DwarfBenchmark.cpp b/folly/experimental/symbolizer/test/DwarfBenchmark.cpp
index 96c352f9..877b5811 100644
--- a/folly/experimental/symbolizer/test/DwarfBenchmark.cpp
+++ b/folly/experimental/symbolizer/test/DwarfBenchmark.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/Benchmark.h>
 #include <folly/experimental/symbolizer/Dwarf.h>
-#include <gflags/gflags.h>
+#include <folly/portability/GFlags.h>
 
 void dummy() {}
 
diff --git a/folly/experimental/test/LockFreeRingBufferTest.cpp b/folly/experimental/test/LockFreeRingBufferTest.cpp
index a25cdaa5..14b373d2 100644
--- a/folly/experimental/test/LockFreeRingBufferTest.cpp
+++ b/folly/experimental/test/LockFreeRingBufferTest.cpp
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 #include <iostream>
 #include <thread>
diff --git a/folly/experimental/test/NestedCommandLineAppTestHelper.cpp b/folly/experimental/test/NestedCommandLineAppTestHelper.cpp
index a5dffbc4..e2dffec3 100644
--- a/folly/experimental/test/NestedCommandLineAppTestHelper.cpp
+++ b/folly/experimental/test/NestedCommandLineAppTestHelper.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <folly/experimental/NestedCommandLineApp.h>
-#include <gflags/gflags.h>
+#include <folly/portability/GFlags.h>
 
 DEFINE_int32(global_foo, 42, "Global foo");
 
diff --git a/folly/experimental/test/ReadMostlySharedPtrBenchmark.cpp b/folly/experimental/test/ReadMostlySharedPtrBenchmark.cpp
index a9d827fc..7901056d 100644
--- a/folly/experimental/test/ReadMostlySharedPtrBenchmark.cpp
+++ b/folly/experimental/test/ReadMostlySharedPtrBenchmark.cpp
@@ -15,14 +15,15 @@
  */
 /* -*- Mode: C++; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
-#include <thread>
+#include <folly/experimental/ReadMostlySharedPtr.h>
+
 #include <iostream>
+#include <thread>
+
 #include <folly/Benchmark.h>
 #include <folly/Memory.h>
-#include <gflags/gflags.h>
-
 #include <folly/experimental/RCURefCount.h>
-#include <folly/experimental/ReadMostlySharedPtr.h>
+#include <folly/portability/GFlags.h>
 
 template <template<typename> class MainPtr,
           template<typename> class WeakPtr,
diff --git a/folly/experimental/test/StringKeyedTest.cpp b/folly/experimental/test/StringKeyedTest.cpp
index 6a790eb7..dd05d0a3 100644
--- a/folly/experimental/test/StringKeyedTest.cpp
+++ b/folly/experimental/test/StringKeyedTest.cpp
@@ -15,19 +15,20 @@
  */
 // Copyright 2013-present Facebook. All Rights Reserved.
 
-#include <gflags/gflags.h>
-#include <glog/logging.h>
-#include <gtest/gtest.h>
-
-#include <string>
-#include <list>
-
-#include <folly/Range.h>
 #include <folly/experimental/StringKeyedMap.h>
 #include <folly/experimental/StringKeyedSet.h>
 #include <folly/experimental/StringKeyedUnorderedMap.h>
 #include <folly/experimental/StringKeyedUnorderedSet.h>
 
+#include <list>
+#include <string>
+
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+
+#include <folly/Range.h>
+#include <folly/portability/GFlags.h>
+
 using folly::StringKeyedMap;
 using folly::StringKeyedSetBase;
 using folly::StringKeyedUnorderedMap;
diff --git a/folly/init/Init.cpp b/folly/init/Init.cpp
index 46d30a08..5b07a9e9 100644
--- a/folly/init/Init.cpp
+++ b/folly/init/Init.cpp
@@ -13,12 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <folly/init/Init.h>
-#include <folly/Singleton.h>
-#include <folly/experimental/symbolizer/SignalHandler.h>
 
 #include <glog/logging.h>
-#include <gflags/gflags.h>
+
+#include <folly/Singleton.h>
+#include <folly/experimental/symbolizer/SignalHandler.h>
+#include <folly/portability/GFlags.h>
 
 namespace folly {
 
diff --git a/folly/io/async/test/EventBaseBenchmark.cpp b/folly/io/async/test/EventBaseBenchmark.cpp
index 6ab39689..a2cc7745 100644
--- a/folly/io/async/test/EventBaseBenchmark.cpp
+++ b/folly/io/async/test/EventBaseBenchmark.cpp
@@ -16,8 +16,7 @@
 
 #include <folly/Benchmark.h>
 #include <folly/io/async/EventBase.h>
-
-#include <gflags/gflags.h>
+#include <folly/portability/GFlags.h>
 
 using namespace folly;
 
diff --git a/folly/io/test/IOBufQueueTest.cpp b/folly/io/test/IOBufQueueTest.cpp
index 59066228..8ba3d7b4 100644
--- a/folly/io/test/IOBufQueueTest.cpp
+++ b/folly/io/test/IOBufQueueTest.cpp
@@ -15,15 +15,15 @@
  */
 
 #include <folly/io/IOBufQueue.h>
-#include <folly/Range.h>
-
-#include <gflags/gflags.h>
-#include <gtest/gtest.h>
 
 #include <iostream>
 #include <stdexcept>
 #include <string.h>
 
+#include <gtest/gtest.h>
+
+#include <folly/Range.h>
+
 using folly::IOBuf;
 using folly::IOBufQueue;
 using folly::StringPiece;
diff --git a/folly/io/test/IOBufTest.cpp b/folly/io/test/IOBufTest.cpp
index 7267b49c..c283db05 100644
--- a/folly/io/test/IOBufTest.cpp
+++ b/folly/io/test/IOBufTest.cpp
@@ -17,15 +17,14 @@
 #include <folly/io/IOBuf.h>
 #include <folly/io/TypedIOBuf.h>
 
-#include <gflags/gflags.h>
+#include <cstddef>
+
 #include <boost/random.hpp>
 #include <gtest/gtest.h>
 
 #include <folly/Malloc.h>
 #include <folly/Range.h>
 
-#include <cstddef>
-
 using folly::fbstring;
 using folly::fbvector;
 using folly::IOBuf;
diff --git a/folly/io/test/NetworkBenchmark.cpp b/folly/io/test/NetworkBenchmark.cpp
index 83525a37..45c265f9 100644
--- a/folly/io/test/NetworkBenchmark.cpp
+++ b/folly/io/test/NetworkBenchmark.cpp
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-#include <folly/io/IOBuf.h>
+#include <vector>
 
-#include <gflags/gflags.h>
 #include <folly/Benchmark.h>
 #include <folly/io/Cursor.h>
-
-#include <vector>
+#include <folly/io/IOBuf.h>
+#include <folly/portability/GFlags.h>
 
 using folly::IOBuf;
 using std::unique_ptr;
diff --git a/folly/io/test/RecordIOTest.cpp b/folly/io/test/RecordIOTest.cpp
index 3025d280..e18fd262 100644
--- a/folly/io/test/RecordIOTest.cpp
+++ b/folly/io/test/RecordIOTest.cpp
@@ -18,10 +18,8 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-
 #include <random>
 
-#include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
@@ -30,6 +28,7 @@
 #include <folly/Random.h>
 #include <folly/experimental/TestUtil.h>
 #include <folly/io/IOBufQueue.h>
+#include <folly/portability/GFlags.h>
 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");
 
diff --git a/folly/portability/GFlags.h b/folly/portability/GFlags.h
index 6f0b1d51..87739bb9 100644
--- a/folly/portability/GFlags.h
+++ b/folly/portability/GFlags.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#if FOLLY_HAVE_LIBGFLAGS
-#include <gflags/gflags.h>
-#else
+#include <folly/portability/Config.h>
+
+#if defined(FOLLY_HAVE_LIBGFLAGS) && (FOLLY_HAVE_LIBGFLAGS == 0)
 // glog/logging.h is dependent on this implementation detail
 // being defined otherwise it undefines all of this -_-....
 //
@@ -58,4 +58,6 @@
   FOLLY_DEFINE_FLAG(unsigned long long, U64, _name, _default)
 #define DEFINE_string(_name, _default, _description) \
   FOLLY_DEFINE_FLAG(std::string, S, _name, _default)
+#else
+#include <gflags/gflags.h>
 #endif
diff --git a/folly/test/AsciiCaseInsensitiveTest.cpp b/folly/test/AsciiCaseInsensitiveTest.cpp
index cd05ba28..ec7f078f 100644
--- a/folly/test/AsciiCaseInsensitiveTest.cpp
+++ b/folly/test/AsciiCaseInsensitiveTest.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/Range.h>
 
-#include <gflags/gflags.h>
+#include <folly/portability/GFlags.h>
 #include <gtest/gtest.h>
 #include <algorithm>
 
diff --git a/folly/test/AtomicUnorderedMapTest.cpp b/folly/test/AtomicUnorderedMapTest.cpp
index 29287e59..d90f126c 100644
--- a/folly/test/AtomicUnorderedMapTest.cpp
+++ b/folly/test/AtomicUnorderedMapTest.cpp
@@ -13,14 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <folly/AtomicUnorderedMap.h>
-#include <folly/test/DeterministicSchedule.h>
-#include <thread>
+
 #include <semaphore.h>
-#include <gflags/gflags.h>
+#include <thread>
+#include <unordered_map>
+
 #include <gtest/gtest.h>
+
 #include <folly/Benchmark.h>
-#include <unordered_map>
+#include <folly/portability/GFlags.h>
+#include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;
 using namespace folly::test;
diff --git a/folly/test/BatonBenchmark.cpp b/folly/test/BatonBenchmark.cpp
index b9c86462..099226a8 100644
--- a/folly/test/BatonBenchmark.cpp
+++ b/folly/test/BatonBenchmark.cpp
@@ -15,13 +15,16 @@
  */
 
 #include <folly/Baton.h>
+
+#include <semaphore.h>
+#include <thread>
+
+#include <gtest/gtest.h>
+
 #include <folly/Benchmark.h>
+#include <folly/portability/GFlags.h>
 #include <folly/test/BatonTestHelpers.h>
 #include <folly/test/DeterministicSchedule.h>
-#include <thread>
-#include <semaphore.h>
-#include <gflags/gflags.h>
-#include <gtest/gtest.h>
 
 using namespace folly;
 using namespace folly::test;
diff --git a/folly/test/BitIteratorTest.cpp b/folly/test/BitIteratorTest.cpp
index d60db674..fdf49b21 100644
--- a/folly/test/BitIteratorTest.cpp
+++ b/folly/test/BitIteratorTest.cpp
@@ -15,15 +15,16 @@
  */
 
 #include <folly/Bits.h>
-#include <folly/Benchmark.h>
 
 #include <algorithm>
 #include <type_traits>
 #include <limits>
 #include <vector>
+
 #include <gtest/gtest.h>
 
-#include <gflags/gflags.h>
+#include <folly/Benchmark.h>
+#include <folly/portability/GFlags.h>
 
 using namespace folly;
 using namespace folly::bititerator_detail;
diff --git a/folly/test/ChecksumTest.cpp b/folly/test/ChecksumTest.cpp
index 8b637dd6..a82bf75e 100644
--- a/folly/test/ChecksumTest.cpp
+++ b/folly/test/ChecksumTest.cpp
@@ -15,11 +15,13 @@
  */
 
 #include <folly/Checksum.h>
-#include <gflags/gflags.h>
+
 #include <gtest/gtest.h>
+
 #include <folly/Benchmark.h>
 #include <folly/Hash.h>
 #include <folly/detail/ChecksumDetail.h>
+#include <folly/portability/GFlags.h>
 
 namespace {
 const unsigned int BUFFER_SIZE = 512 * 1024 * sizeof(uint64_t);
diff --git a/folly/test/ConcurrentSkipListBenchmark.cpp b/folly/test/ConcurrentSkipListBenchmark.cpp
index 61fcae25..d1884a4a 100644
--- a/folly/test/ConcurrentSkipListBenchmark.cpp
+++ b/folly/test/ConcurrentSkipListBenchmark.cpp
@@ -20,13 +20,12 @@
 #include <set>
 #include <thread>
 
-#include <gflags/gflags.h>
-#include <glog/logging.h>
 #include <folly/Benchmark.h>
 #include <folly/ConcurrentSkipList.h>
 #include <folly/Hash.h>
 #include <folly/RWSpinLock.h>
-
+#include <folly/portability/GFlags.h>
+#include <glog/logging.h>
 
 DEFINE_int32(num_threads, 12, "num concurrent threads to test");
 
diff --git a/folly/test/ConcurrentSkipListTest.cpp b/folly/test/ConcurrentSkipListTest.cpp
index 0a01d8f2..b63be004 100644
--- a/folly/test/ConcurrentSkipListTest.cpp
+++ b/folly/test/ConcurrentSkipListTest.cpp
@@ -16,6 +16,8 @@
 
 // @author: Xin Liu <xliux@fb.com>
 
+#include <folly/ConcurrentSkipList.h>
+
 #include <atomic>
 #include <memory>
 #include <set>
@@ -24,15 +26,13 @@
 #include <system_error>
 
 #include <glog/logging.h>
-#include <gflags/gflags.h>
+#include <gtest/gtest.h>
 
 #include <folly/Arena.h>
-#include <folly/ConcurrentSkipList.h>
 #include <folly/Foreach.h>
 #include <folly/Memory.h>
 #include <folly/String.h>
-
-#include <gtest/gtest.h>
+#include <folly/portability/GFlags.h>
 
 DEFINE_int32(num_threads, 12, "num concurrent threads to test");
 
diff --git a/folly/test/DeterministicScheduleTest.cpp b/folly/test/DeterministicScheduleTest.cpp
index 5ec300b4..ceca71e3 100644
--- a/folly/test/DeterministicScheduleTest.cpp
+++ b/folly/test/DeterministicScheduleTest.cpp
@@ -16,9 +16,10 @@
 
 #include <folly/test/DeterministicSchedule.h>
 
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
+#include <folly/portability/GFlags.h>
+
 using namespace folly::test;
 
 TEST(DeterministicSchedule, uniform) {
diff --git a/folly/test/DynamicOtherTest.cpp b/folly/test/DynamicOtherTest.cpp
index 5d533b4a..bf3b462f 100644
--- a/folly/test/DynamicOtherTest.cpp
+++ b/folly/test/DynamicOtherTest.cpp
@@ -18,8 +18,8 @@
 
 #include <folly/gen/Base.h>
 #include <folly/json.h>
+#include <folly/portability/GFlags.h>
 
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
 #include <iostream>
diff --git a/folly/test/ExceptionWrapperBenchmark.cpp b/folly/test/ExceptionWrapperBenchmark.cpp
index 2448324c..fbd72820 100644
--- a/folly/test/ExceptionWrapperBenchmark.cpp
+++ b/folly/test/ExceptionWrapperBenchmark.cpp
@@ -15,14 +15,14 @@
  */
 #include <folly/ExceptionWrapper.h>
 
-#include <gflags/gflags.h>
 #include <atomic>
 #include <exception>
-#include <vector>
 #include <stdexcept>
 #include <thread>
+#include <vector>
 
 #include <folly/Benchmark.h>
+#include <folly/portability/GFlags.h>
 
 DEFINE_int32(num_threads, 32, "Number of threads to run concurrency "
                               "benchmarks");
diff --git a/folly/test/FBStringBenchmark.cpp b/folly/test/FBStringBenchmark.cpp
index e6d8a8e5..086c8ae5 100644
--- a/folly/test/FBStringBenchmark.cpp
+++ b/folly/test/FBStringBenchmark.cpp
@@ -20,18 +20,17 @@
 #include <folly/FBString.h>
 
 #include <cstdlib>
-
 #include <list>
 #include <fstream>
 #include <sstream>
+
 #include <boost/algorithm/string.hpp>
 #include <boost/random.hpp>
 
-#include <gflags/gflags.h>
-
+#include <folly/Benchmark.h>
 #include <folly/Foreach.h>
 #include <folly/Random.h>
-#include <folly/Benchmark.h>
+#include <folly/portability/GFlags.h>
 
 using namespace std;
 using namespace folly;
diff --git a/folly/test/FBVectorBenchmark.cpp b/folly/test/FBVectorBenchmark.cpp
index cda23e90..0b676912 100644
--- a/folly/test/FBVectorBenchmark.cpp
+++ b/folly/test/FBVectorBenchmark.cpp
@@ -17,14 +17,13 @@
 //
 // Author: andrei.alexandrescu@fb.com
 
-#include <folly/Foreach.h>
-#include <folly/Traits.h>
-#include <folly/Random.h>
+#include <folly/Benchmark.h>
 #include <folly/FBString.h>
 #include <folly/FBVector.h>
-#include <folly/Benchmark.h>
-
-#include <gflags/gflags.h>
+#include <folly/Foreach.h>
+#include <folly/Random.h>
+#include <folly/Traits.h>
+#include <folly/portability/GFlags.h>
 
 #include <gtest/gtest.h>
 #include <list>
diff --git a/folly/test/FileLockTest.cpp b/folly/test/FileLockTest.cpp
index 56d4ef7f..8001e594 100644
--- a/folly/test/FileLockTest.cpp
+++ b/folly/test/FileLockTest.cpp
@@ -16,18 +16,17 @@
 
 #include <folly/File.h>
 
+#include <mutex>
+
+#include <glog/logging.h>
+#include <gtest/gtest.h>
 #include <boost/thread/locks.hpp>
 
 #include <folly/String.h>
 #include <folly/Subprocess.h>
-#include <folly/experimental/io/FsUtil.h>
 #include <folly/experimental/TestUtil.h>
-
-#include <gflags/gflags.h>
-#include <glog/logging.h>
-#include <gtest/gtest.h>
-
-#include <mutex>
+#include <folly/experimental/io/FsUtil.h>
+#include <folly/portability/GFlags.h>
 
 using namespace folly;
 using namespace folly::test;
diff --git a/folly/test/FileTestLockHelper.cpp b/folly/test/FileTestLockHelper.cpp
index 1067d31f..781979ea 100644
--- a/folly/test/FileTestLockHelper.cpp
+++ b/folly/test/FileTestLockHelper.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <gflags/gflags.h>
 #include <glog/logging.h>
 
 #include <folly/File.h>
+#include <folly/portability/GFlags.h>
 
 DEFINE_bool(s, false, "get shared lock");
 DEFINE_bool(x, false, "get exclusive lock");
diff --git a/folly/test/FormatOtherTest.cpp b/folly/test/FormatOtherTest.cpp
index 60733f90..95132166 100644
--- a/folly/test/FormatOtherTest.cpp
+++ b/folly/test/FormatOtherTest.cpp
@@ -16,16 +16,15 @@
 
 #include <folly/Format.h>
 
+#include <glog/logging.h>
+#include <gtest/gtest.h>
+
 #include <folly/FBVector.h>
 #include <folly/FileUtil.h>
 #include <folly/dynamic.h>
 #include <folly/json.h>
 #include <folly/small_vector.h>
 
-#include <glog/logging.h>
-#include <gflags/gflags.h>
-#include <gtest/gtest.h>
-
 using namespace folly;
 
 TEST(FormatOther, file) {
diff --git a/folly/test/HashBenchmark.cpp b/folly/test/HashBenchmark.cpp
index 7d5b075c..eaf06e78 100644
--- a/folly/test/HashBenchmark.cpp
+++ b/folly/test/HashBenchmark.cpp
@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-#include <stdint.h>
+#include <folly/Hash.h>
 
+#include <stdint.h>
 #include <deque>
 #include <random>
 #include <string>
 #include <vector>
 
+#include <glog/logging.h>
+
 #include <folly/Benchmark.h>
 #include <folly/Format.h>
-#include <folly/Hash.h>
 #include <folly/Preprocessor.h>
-#include <gflags/gflags.h>
-#include <glog/logging.h>
+#include <folly/portability/GFlags.h>
 
 namespace detail {
 
diff --git a/folly/test/HistogramBenchmark.cpp b/folly/test/HistogramBenchmark.cpp
index 541d5ced..6f74fcf4 100644
--- a/folly/test/HistogramBenchmark.cpp
+++ b/folly/test/HistogramBenchmark.cpp
@@ -15,10 +15,9 @@
  */
 #include <folly/stats/Histogram.h>
 
-#include <gflags/gflags.h>
-
 #include <folly/Benchmark.h>
 #include <folly/Foreach.h>
+#include <folly/portability/GFlags.h>
 
 using folly::Histogram;
 
diff --git a/folly/test/HistogramTest.cpp b/folly/test/HistogramTest.cpp
index 143dea6e..680d8c0c 100644
--- a/folly/test/HistogramTest.cpp
+++ b/folly/test/HistogramTest.cpp
@@ -17,7 +17,6 @@
 #include <folly/stats/Histogram.h>
 #include <folly/stats/Histogram-defs.h>
 
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
 using folly::Histogram;
diff --git a/folly/test/JsonOtherTest.cpp b/folly/test/JsonOtherTest.cpp
index efdacee9..01fd4cff 100644
--- a/folly/test/JsonOtherTest.cpp
+++ b/folly/test/JsonOtherTest.cpp
@@ -18,9 +18,9 @@
 
 #include <folly/Benchmark.h>
 #include <folly/FileUtil.h>
+#include <folly/portability/GFlags.h>
 
 #include <gtest/gtest.h>
-#include <gflags/gflags.h>
 
 using folly::dynamic;
 using folly::parseJson;
diff --git a/folly/test/LifoSemTests.cpp b/folly/test/LifoSemTests.cpp
index 4396ffa4..71889c40 100644
--- a/folly/test/LifoSemTests.cpp
+++ b/folly/test/LifoSemTests.cpp
@@ -15,15 +15,16 @@
  */
 
 #include <folly/LifoSem.h>
-#include <folly/test/DeterministicSchedule.h>
 
-#include <thread>
 #include <semaphore.h>
-#include <gflags/gflags.h>
+#include <thread>
+
 #include <gtest/gtest.h>
 
 #include <folly/Benchmark.h>
 #include <folly/Random.h>
+#include <folly/portability/GFlags.h>
+#include <folly/test/DeterministicSchedule.h>
 
 using namespace folly;
 using namespace folly::test;
diff --git a/folly/test/ProducerConsumerQueueBenchmark.cpp b/folly/test/ProducerConsumerQueueBenchmark.cpp
index 2a954d4e..068dfc06 100644
--- a/folly/test/ProducerConsumerQueueBenchmark.cpp
+++ b/folly/test/ProducerConsumerQueueBenchmark.cpp
@@ -21,12 +21,12 @@
 #include <stdio.h>
 #include <pthread.h>
 
-#include <gflags/gflags.h>
-#include <glog/logging.h>
 #include <folly/Benchmark.h>
+#include <folly/ProducerConsumerQueue.h>
+#include <folly/portability/GFlags.h>
 #include <folly/stats/Histogram.h>
 #include <folly/stats/Histogram-defs.h>
-#include <folly/ProducerConsumerQueue.h>
+#include <glog/logging.h>
 
 namespace {
 
diff --git a/folly/test/ProducerConsumerQueueTest.cpp b/folly/test/ProducerConsumerQueueTest.cpp
index d358035a..bd1fa0c3 100644
--- a/folly/test/ProducerConsumerQueueTest.cpp
+++ b/folly/test/ProducerConsumerQueueTest.cpp
@@ -16,13 +16,14 @@
 
 #include <folly/ProducerConsumerQueue.h>
 
-#include <gtest/gtest.h>
-#include <vector>
 #include <atomic>
 #include <chrono>
 #include <memory>
 #include <thread>
+#include <vector>
+
 #include <glog/logging.h>
+#include <gtest/gtest.h>
 
 //////////////////////////////////////////////////////////////////////
 
diff --git a/folly/test/RWSpinLockTest.cpp b/folly/test/RWSpinLockTest.cpp
index b3df0226..18011e1a 100644
--- a/folly/test/RWSpinLockTest.cpp
+++ b/folly/test/RWSpinLockTest.cpp
@@ -18,21 +18,19 @@
 // @author xliu (xliux@fb.com)
 //
 
+#include <folly/RWSpinLock.h>
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <vector>
 #include <thread>
 
-#include <gtest/gtest.h>
 #include <glog/logging.h>
-#include <folly/RWSpinLock.h>
+#include <gtest/gtest.h>
+
+#include <folly/portability/GFlags.h>
 
-#if FOLLY_HAVE_LIBGFLAGS
-#include <gflags/gflags.h>
 DEFINE_int32(num_threads, 8, "num threads");
-#else
-constexpr int FLAGS_num_threads = 8;
-#endif
 
 namespace {
 
diff --git a/folly/test/SharedMutexTest.cpp b/folly/test/SharedMutexTest.cpp
index 70661b5e..8672e665 100644
--- a/folly/test/SharedMutexTest.cpp
+++ b/folly/test/SharedMutexTest.cpp
@@ -19,16 +19,17 @@
 #include <stdlib.h>
 #include <thread>
 #include <vector>
+
+#include <gtest/gtest.h>
 #include <boost/optional.hpp>
+#include <boost/thread/shared_mutex.hpp>
+
 #include <folly/Benchmark.h>
 #include <folly/MPMCQueue.h>
+#include <folly/RWSpinLock.h>
 #include <folly/Random.h>
+#include <folly/portability/GFlags.h>
 #include <folly/test/DeterministicSchedule.h>
-#include <gflags/gflags.h>
-#include <gtest/gtest.h>
-
-#include <boost/thread/shared_mutex.hpp>
-#include <folly/RWSpinLock.h>
 
 using namespace folly;
 using namespace folly::test;
diff --git a/folly/test/SingletonBenchmark.cpp b/folly/test/SingletonBenchmark.cpp
index 11d00d2a..5fa38e4b 100644
--- a/folly/test/SingletonBenchmark.cpp
+++ b/folly/test/SingletonBenchmark.cpp
@@ -15,13 +15,14 @@
  */
 /* -*- Mode: C++; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
-#include <thread>
+#include <folly/Singleton.h>
+
 #include <iostream>
+#include <thread>
+
 #include <folly/Benchmark.h>
 #include <folly/Memory.h>
-#include <gflags/gflags.h>
-
-#include <folly/Singleton.h>
+#include <folly/portability/GFlags.h>
 
 using namespace folly;
 
diff --git a/folly/test/SparseByteSetBench.cpp b/folly/test/SparseByteSetBench.cpp
index 0f3da472..83c6edd8 100644
--- a/folly/test/SparseByteSetBench.cpp
+++ b/folly/test/SparseByteSetBench.cpp
@@ -18,13 +18,13 @@
  *  A benchmark comparing SparseByteSet to bitset<256> and bool[256].
  */
 
-#include <bitset>
-#include <random>
-#include <vector>
-#include <gflags/gflags.h>
 #include <folly/Benchmark.h>
 #include <folly/Format.h>
 #include <folly/SparseByteSet.h>
+#include <folly/portability/GFlags.h>
+#include <bitset>
+#include <random>
+#include <vector>
 
 using namespace std;
 using namespace folly;
diff --git a/folly/test/SparseByteSetTest.cpp b/folly/test/SparseByteSetTest.cpp
index bf92d13f..f5f6f1a1 100644
--- a/folly/test/SparseByteSetTest.cpp
+++ b/folly/test/SparseByteSetTest.cpp
@@ -14,11 +14,13 @@
  * limitations under the License.
  */
 
+#include <folly/SparseByteSet.h>
+
 #include <cstdint>
 #include <limits>
 #include <random>
 #include <set>
-#include <folly/SparseByteSet.h>
+
 #include <gtest/gtest.h>
 
 using namespace std;
diff --git a/folly/test/SubprocessTestParentDeathHelper.cpp b/folly/test/SubprocessTestParentDeathHelper.cpp
index 3aef378b..7ade0795 100644
--- a/folly/test/SubprocessTestParentDeathHelper.cpp
+++ b/folly/test/SubprocessTestParentDeathHelper.cpp
@@ -28,11 +28,11 @@
 #include <signal.h>
 #include <unistd.h>
 
-#include <gflags/gflags.h>
 #include <glog/logging.h>
 
 #include <folly/Conv.h>
 #include <folly/Subprocess.h>
+#include <folly/portability/GFlags.h>
 
 using folly::Subprocess;
 
diff --git a/folly/test/ThreadCachedIntTest.cpp b/folly/test/ThreadCachedIntTest.cpp
index a3d13101..4f5c377e 100644
--- a/folly/test/ThreadCachedIntTest.cpp
+++ b/folly/test/ThreadCachedIntTest.cpp
@@ -15,14 +15,16 @@
  */
 
 #include <folly/ThreadCachedInt.h>
-#include <folly/Hash.h>
 
 #include <atomic>
 #include <thread>
-#include <gtest/gtest.h>
-#include <gflags/gflags.h>
+
 #include <glog/logging.h>
+#include <gtest/gtest.h>
+
 #include <folly/Benchmark.h>
+#include <folly/Hash.h>
+#include <folly/portability/GFlags.h>
 
 using namespace folly;
 
diff --git a/folly/test/ThreadLocalBenchmark.cpp b/folly/test/ThreadLocalBenchmark.cpp
index dfaec0b0..6009cc6a 100644
--- a/folly/test/ThreadLocalBenchmark.cpp
+++ b/folly/test/ThreadLocalBenchmark.cpp
@@ -33,11 +33,11 @@
 #include <unordered_map>
 
 #include <boost/thread/tss.hpp>
-#include <gflags/gflags.h>
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>
 #include <folly/experimental/io/FsUtil.h>
+#include <folly/portability/GFlags.h>
 
 using namespace folly;
 
diff --git a/folly/test/function_benchmark/main.cpp b/folly/test/function_benchmark/main.cpp
index 4fa63e08..58ddcd0a 100644
--- a/folly/test/function_benchmark/main.cpp
+++ b/folly/test/function_benchmark/main.cpp
@@ -17,10 +17,11 @@
 #include <folly/test/function_benchmark/benchmark_impl.h>
 #include <folly/test/function_benchmark/test_functions.h>
 
+#include <glog/logging.h>
+
 #include <folly/Benchmark.h>
 #include <folly/ScopeGuard.h>
-#include <gflags/gflags.h>
-#include <glog/logging.h>
+#include <folly/portability/GFlags.h>
 
 using folly::ScopeGuard;
 using folly::makeGuard;
diff --git a/folly/test/stl_tests/StlVectorTest.cpp b/folly/test/stl_tests/StlVectorTest.cpp
index 1b3d6164..a9c39492 100644
--- a/folly/test/stl_tests/StlVectorTest.cpp
+++ b/folly/test/stl_tests/StlVectorTest.cpp
@@ -184,12 +184,13 @@ THOUGHTS:
 #include <cstddef>
 #include <iomanip>
 
-#include <folly/ScopeGuard.h>
-#include <folly/Conv.h>
-#include <boost/preprocessor.hpp>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <gflags/gflags.h>
 #include <gtest/gtest.h>
+#include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/preprocessor.hpp>
+
+#include <folly/Conv.h>
+#include <folly/ScopeGuard.h>
+#include <folly/portability/GFlags.h>
 
 using namespace std;
 using namespace folly;
-- 
2.34.1