From: Tudor Bosman <tudorb@fb.com>
Date: Mon, 30 Jun 2014 18:56:53 +0000 (-0700)
Subject: Codemod: use #include angle brackets in folly and thrift
X-Git-Tag: v0.22.0~486
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ce64f0f685111ac24c7a321ea56d0c3524621df1;p=folly.git

Codemod: use #include angle brackets in folly and thrift

Summary: Also changed the thrift compilers to emit code with <...>.

Test Plan: fbconfig -r folly thrift && fbmake opt && fbmake runtests_opt

Reviewed By: davejwatson@fb.com

Subscribers: ruibalp, nli, shilin, tjackson, fugalh, alandau, bmatheny, njormrod

FB internal diff: D1411225
---

diff --git a/folly/Arena.h b/folly/Arena.h
index 5ea7552f..2b93aa34 100644
--- a/folly/Arena.h
+++ b/folly/Arena.h
@@ -23,10 +23,10 @@
 #include <utility>
 #include <boost/intrusive/slist.hpp>
 
-#include "folly/Conv.h"
-#include "folly/Likely.h"
-#include "folly/Malloc.h"
-#include "folly/Memory.h"
+#include <folly/Conv.h>
+#include <folly/Likely.h>
+#include <folly/Malloc.h>
+#include <folly/Memory.h>
 
 namespace folly {
 
@@ -244,6 +244,6 @@ struct IsArenaAllocator<SysArena> : std::true_type { };
 
 }  // namespace folly
 
-#include "folly/Arena-inl.h"
+#include <folly/Arena-inl.h>
 
 #endif /* FOLLY_ARENA_H_ */
diff --git a/folly/AtomicHashArray-inl.h b/folly/AtomicHashArray-inl.h
index 4ad8a897..95c86df3 100644
--- a/folly/AtomicHashArray-inl.h
+++ b/folly/AtomicHashArray-inl.h
@@ -18,8 +18,8 @@
 #error "This should only be included by AtomicHashArray.h"
 #endif
 
-#include "folly/Bits.h"
-#include "folly/detail/AtomicHashUtils.h"
+#include <folly/Bits.h>
+#include <folly/detail/AtomicHashUtils.h>
 
 namespace folly {
 
diff --git a/folly/AtomicHashArray.h b/folly/AtomicHashArray.h
index d5ee3fe9..043909c0 100644
--- a/folly/AtomicHashArray.h
+++ b/folly/AtomicHashArray.h
@@ -37,8 +37,8 @@
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/noncopyable.hpp>
 
-#include "folly/Hash.h"
-#include "folly/ThreadCachedInt.h"
+#include <folly/Hash.h>
+#include <folly/ThreadCachedInt.h>
 
 namespace folly {
 
diff --git a/folly/AtomicHashMap-inl.h b/folly/AtomicHashMap-inl.h
index afac177f..264064b7 100644
--- a/folly/AtomicHashMap-inl.h
+++ b/folly/AtomicHashMap-inl.h
@@ -18,7 +18,7 @@
 #error "This should only be included by AtomicHashMap.h"
 #endif
 
-#include "folly/detail/AtomicHashUtils.h"
+#include <folly/detail/AtomicHashUtils.h>
 
 namespace folly {
 
diff --git a/folly/AtomicHashMap.h b/folly/AtomicHashMap.h
index 33ab11c9..21c52f0e 100644
--- a/folly/AtomicHashMap.h
+++ b/folly/AtomicHashMap.h
@@ -90,11 +90,11 @@
 #include <functional>
 #include <atomic>
 
-#include "folly/AtomicHashArray.h"
-#include "folly/Foreach.h"
-#include "folly/Hash.h"
-#include "folly/Likely.h"
-#include "folly/ThreadCachedInt.h"
+#include <folly/AtomicHashArray.h>
+#include <folly/Foreach.h>
+#include <folly/Hash.h>
+#include <folly/Likely.h>
+#include <folly/ThreadCachedInt.h>
 
 namespace folly {
 
diff --git a/folly/Benchmark.h b/folly/Benchmark.h
index 0ca2b167..4fd28b48 100644
--- a/folly/Benchmark.h
+++ b/folly/Benchmark.h
@@ -17,8 +17,8 @@
 #ifndef FOLLY_BENCHMARK_H_
 #define FOLLY_BENCHMARK_H_
 
-#include "folly/Portability.h"
-#include "folly/Preprocessor.h" // for FB_ANONYMOUS_VARIABLE
+#include <folly/Portability.h>
+#include <folly/Preprocessor.h> // for FB_ANONYMOUS_VARIABLE
 #include <cassert>
 #include <ctime>
 #include <boost/function_types/function_arity.hpp>
diff --git a/folly/Bits.cpp b/folly/Bits.cpp
index 4a36bf1a..2c6694f2 100644
--- a/folly/Bits.cpp
+++ b/folly/Bits.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "folly/Bits.h"
+#include <folly/Bits.h>
 
-#include "folly/CpuId.h"
-#include "folly/Portability.h"
+#include <folly/CpuId.h>
+#include <folly/Portability.h>
 
 // None of this is necessary if we're compiling for a target that supports
 // popcnt
diff --git a/folly/Bits.h b/folly/Bits.h
index 78160533..491fcf70 100644
--- a/folly/Bits.h
+++ b/folly/Bits.h
@@ -55,7 +55,7 @@
 #ifndef FOLLY_BITS_H_
 #define FOLLY_BITS_H_
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 #ifndef __GNUC__
 #error GCC required
@@ -69,12 +69,12 @@
 #endif
 
 #ifndef FOLLY_NO_CONFIG
-#include "folly/folly-config.h"
+#include <folly/folly-config.h>
 #endif
 
-#include "folly/detail/BitsDetail.h"
-#include "folly/detail/BitIteratorDetail.h"
-#include "folly/Likely.h"
+#include <folly/detail/BitsDetail.h>
+#include <folly/detail/BitIteratorDetail.h>
+#include <folly/Likely.h>
 
 #if FOLLY_HAVE_BYTESWAP_H
 # include <byteswap.h>
diff --git a/folly/Checksum.cpp b/folly/Checksum.cpp
index ba32d687..3882a6e8 100644
--- a/folly/Checksum.cpp
+++ b/folly/Checksum.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "folly/Checksum.h"
+#include <folly/Checksum.h>
 #include <algorithm>
 #include <stdexcept>
 #include <boost/crc.hpp>
-#include "folly/CpuId.h"
+#include <folly/CpuId.h>
 
 namespace folly {
 
diff --git a/folly/Chrono.h b/folly/Chrono.h
index 1a9dfa54..d78e7663 100644
--- a/folly/Chrono.h
+++ b/folly/Chrono.h
@@ -19,7 +19,7 @@
 #define FOLLY_CHRONO_H_
 
 #include <chrono>
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 // gcc 4.6 uses an obsolete name for steady_clock, although the implementation
 // is the same
diff --git a/folly/ConcurrentSkipList-inl.h b/folly/ConcurrentSkipList-inl.h
index 11813f03..227a3325 100644
--- a/folly/ConcurrentSkipList-inl.h
+++ b/folly/ConcurrentSkipList-inl.h
@@ -32,9 +32,9 @@
 #include <boost/type_traits.hpp>
 #include <glog/logging.h>
 
-#include "folly/Memory.h"
-#include "folly/SmallLocks.h"
-#include "folly/ThreadLocal.h"
+#include <folly/Memory.h>
+#include <folly/SmallLocks.h>
+#include <folly/ThreadLocal.h>
 
 namespace folly { namespace detail {
 
diff --git a/folly/ConcurrentSkipList.h b/folly/ConcurrentSkipList.h
index 265f5fc5..987aa094 100644
--- a/folly/ConcurrentSkipList.h
+++ b/folly/ConcurrentSkipList.h
@@ -128,10 +128,10 @@ Sample usage:
 #include <boost/iterator/iterator_facade.hpp>
 #include <glog/logging.h>
 
-#include "folly/ConcurrentSkipList-inl.h"
-#include "folly/Likely.h"
-#include "folly/Memory.h"
-#include "folly/SmallLocks.h"
+#include <folly/ConcurrentSkipList-inl.h>
+#include <folly/Likely.h>
+#include <folly/Memory.h>
+#include <folly/SmallLocks.h>
 
 namespace folly {
 
diff --git a/folly/Conv.cpp b/folly/Conv.cpp
index a5dc1ac1..4f825829 100644
--- a/folly/Conv.cpp
+++ b/folly/Conv.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 #define FOLLY_CONV_INTERNAL
-#include "folly/Conv.h"
+#include <folly/Conv.h>
 
 namespace folly {
 namespace detail {
diff --git a/folly/Conv.h b/folly/Conv.h
index 120eda96..79397262 100644
--- a/folly/Conv.h
+++ b/folly/Conv.h
@@ -24,10 +24,10 @@
 #ifndef FOLLY_BASE_CONV_H_
 #define FOLLY_BASE_CONV_H_
 
-#include "folly/FBString.h"
-#include "folly/Likely.h"
-#include "folly/Preprocessor.h"
-#include "folly/Range.h"
+#include <folly/FBString.h>
+#include <folly/Likely.h>
+#include <folly/Preprocessor.h>
+#include <folly/Range.h>
 
 #include <boost/implicit_cast.hpp>
 #include <type_traits>
diff --git a/folly/CpuId.h b/folly/CpuId.h
index facabe18..966bfc1f 100644
--- a/folly/CpuId.h
+++ b/folly/CpuId.h
@@ -18,7 +18,7 @@
 #define FOLLY_CPUID_H_
 
 #include <cstdint>
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 namespace folly {
 
diff --git a/folly/Demangle.cpp b/folly/Demangle.cpp
index 3922f74f..765db5ac 100644
--- a/folly/Demangle.cpp
+++ b/folly/Demangle.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "folly/Demangle.h"
+#include <folly/Demangle.h>
 
 #include <algorithm>
 #include <string.h>
 
-#include "folly/Malloc.h"
+#include <folly/Malloc.h>
 
 #if FOLLY_HAVE_CPLUS_DEMANGLE_V3_CALLBACK
 # include <cxxabi.h>
diff --git a/folly/Demangle.h b/folly/Demangle.h
index 205fdb65..58aa11eb 100644
--- a/folly/Demangle.h
+++ b/folly/Demangle.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "folly/FBString.h"
+#include <folly/FBString.h>
 
 namespace folly {
 
diff --git a/folly/DiscriminatedPtr.h b/folly/DiscriminatedPtr.h
index b2e363eb..40821bb3 100644
--- a/folly/DiscriminatedPtr.h
+++ b/folly/DiscriminatedPtr.h
@@ -30,9 +30,9 @@
 #include <limits>
 #include <stdexcept>
 #include <glog/logging.h>
-#include "folly/Likely.h"
-#include "folly/Portability.h"
-#include "folly/detail/DiscriminatedPtrDetail.h"
+#include <folly/Likely.h>
+#include <folly/Portability.h>
+#include <folly/detail/DiscriminatedPtrDetail.h>
 
 #if !FOLLY_X64
 # error "DiscriminatedPtr is x64-specific code."
diff --git a/folly/DynamicConverter.h b/folly/DynamicConverter.h
index d6ade8c9..d64dcc28 100644
--- a/folly/DynamicConverter.h
+++ b/folly/DynamicConverter.h
@@ -19,7 +19,7 @@
 #ifndef DYNAMIC_CONVERTER_H
 #define DYNAMIC_CONVERTER_H
 
-#include "folly/dynamic.h"
+#include <folly/dynamic.h>
 namespace folly {
   template <typename T> T convertTo(const dynamic&);
   template <typename T> dynamic toDynamic(const T&);
@@ -41,7 +41,7 @@ namespace folly {
 #include <iterator>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/mpl/has_xxx.hpp>
-#include "folly/Likely.h"
+#include <folly/Likely.h>
 
 namespace folly {
 
diff --git a/folly/Exception.h b/folly/Exception.h
index cfa265d8..f0547c02 100644
--- a/folly/Exception.h
+++ b/folly/Exception.h
@@ -23,10 +23,10 @@
 #include <stdexcept>
 #include <system_error>
 
-#include "folly/Conv.h"
-#include "folly/FBString.h"
-#include "folly/Likely.h"
-#include "folly/Portability.h"
+#include <folly/Conv.h>
+#include <folly/FBString.h>
+#include <folly/Likely.h>
+#include <folly/Portability.h>
 
 namespace folly {
 
diff --git a/folly/ExceptionWrapper.h b/folly/ExceptionWrapper.h
index 23a9ac7a..726a27fc 100644
--- a/folly/ExceptionWrapper.h
+++ b/folly/ExceptionWrapper.h
@@ -20,7 +20,7 @@
 #include <cassert>
 #include <exception>
 #include <memory>
-#include "folly/detail/ExceptionWrapper.h"
+#include <folly/detail/ExceptionWrapper.h>
 
 namespace folly {
 
diff --git a/folly/FBString.h b/folly/FBString.h
index 4b59ac9e..90c00fe9 100644
--- a/folly/FBString.h
+++ b/folly/FBString.h
@@ -44,7 +44,7 @@
 
 #else // !_LIBSTDCXX_FBSTRING
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 // libc++ doesn't provide this header, nor does msvc
 #ifdef FOLLY_HAVE_BITS_CXXCONFIG_H
@@ -56,10 +56,10 @@
 #include <cassert>
 #include <algorithm>
 
-#include "folly/Traits.h"
-#include "folly/Malloc.h"
-#include "folly/Hash.h"
-#include "folly/ScopeGuard.h"
+#include <folly/Traits.h>
+#include <folly/Malloc.h>
+#include <folly/Hash.h>
+#include <folly/ScopeGuard.h>
 
 #if FOLLY_HAVE_DEPRECATED_ASSOC
 #ifdef _GLIBCXX_SYMVER
diff --git a/folly/FBVector.h b/folly/FBVector.h
index f7b8e678..1a04eebc 100644
--- a/folly/FBVector.h
+++ b/folly/FBVector.h
@@ -36,15 +36,15 @@
 #include <type_traits>
 #include <utility>
 
-#include "folly/Likely.h"
-#include "folly/Malloc.h"
-#include "folly/Traits.h"
+#include <folly/Likely.h>
+#include <folly/Malloc.h>
+#include <folly/Traits.h>
 
 #include <boost/operators.hpp>
 
 // some files expected these from FBVector
 #include <limits>
-#include "folly/Foreach.h"
+#include <folly/Foreach.h>
 #include <boost/type_traits.hpp>
 #include <boost/utility/enable_if.hpp>
 
diff --git a/folly/File.cpp b/folly/File.cpp
index c60dfbce..12c4902f 100644
--- a/folly/File.cpp
+++ b/folly/File.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include "folly/File.h"
+#include <folly/File.h>
 
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "folly/Exception.h"
-#include "folly/FileUtil.h"
-#include "folly/Format.h"
-#include "folly/ScopeGuard.h"
+#include <folly/Exception.h>
+#include <folly/FileUtil.h>
+#include <folly/Format.h>
+#include <folly/ScopeGuard.h>
 
 #include <system_error>
 
diff --git a/folly/FileUtil.cpp b/folly/FileUtil.cpp
index 6ef48e85..fd82b278 100644
--- a/folly/FileUtil.cpp
+++ b/folly/FileUtil.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/FileUtil.h"
+#include <folly/FileUtil.h>
 
 #include <cerrno>
 #ifdef __APPLE__
@@ -23,7 +23,7 @@
 #include <sys/file.h>
 #include <sys/socket.h>
 
-#include "folly/detail/FileUtilDetail.h"
+#include <folly/detail/FileUtilDetail.h>
 
 namespace folly {
 
diff --git a/folly/FileUtil.h b/folly/FileUtil.h
index 4eb56df3..2679f928 100644
--- a/folly/FileUtil.h
+++ b/folly/FileUtil.h
@@ -17,9 +17,9 @@
 #ifndef FOLLY_FILEUTIL_H_
 #define FOLLY_FILEUTIL_H_
 
-#include "folly/Conv.h"
-#include "folly/Portability.h"
-#include "folly/ScopeGuard.h"
+#include <folly/Conv.h>
+#include <folly/Portability.h>
+#include <folly/ScopeGuard.h>
 
 #include <cassert>
 #include <limits>
diff --git a/folly/Fingerprint.h b/folly/Fingerprint.h
index a0c47456..9dbf13e9 100644
--- a/folly/Fingerprint.h
+++ b/folly/Fingerprint.h
@@ -47,7 +47,7 @@
 
 #include <cstdint>
 
-#include "folly/Range.h"
+#include <folly/Range.h>
 
 namespace folly {
 
diff --git a/folly/Format-inl.h b/folly/Format-inl.h
index 79ea1f79..625233f5 100644
--- a/folly/Format-inl.h
+++ b/folly/Format-inl.h
@@ -18,8 +18,8 @@
 #error This file may only be included from Format.h.
 #endif
 
-#include "folly/Exception.h"
-#include "folly/Traits.h"
+#include <folly/Exception.h>
+#include <folly/Traits.h>
 
 // Ignore -Wformat-nonliteral warnings within this file
 #pragma GCC diagnostic push
diff --git a/folly/Format.cpp b/folly/Format.cpp
index 553c550a..53a21862 100644
--- a/folly/Format.cpp
+++ b/folly/Format.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Format.h"
+#include <folly/Format.h>
 
 namespace folly {
 namespace detail {
diff --git a/folly/Format.h b/folly/Format.h
index 7cc83413..343f7b53 100644
--- a/folly/Format.h
+++ b/folly/Format.h
@@ -28,14 +28,14 @@
 
 #include <double-conversion/double-conversion.h>
 
-#include "folly/FBVector.h"
-#include "folly/Conv.h"
-#include "folly/Range.h"
-#include "folly/Traits.h"
-#include "folly/Likely.h"
-#include "folly/String.h"
-#include "folly/small_vector.h"
-#include "folly/FormatArg.h"
+#include <folly/FBVector.h>
+#include <folly/Conv.h>
+#include <folly/Range.h>
+#include <folly/Traits.h>
+#include <folly/Likely.h>
+#include <folly/String.h>
+#include <folly/small_vector.h>
+#include <folly/FormatArg.h>
 
 // Ignore shadowing warnings within this file, so includers can use -Wshadow.
 #pragma GCC diagnostic push
@@ -415,7 +415,7 @@ void formatFormatter(const Formatter<containerMode, Args...>& formatter,
 
 }  // namespace folly
 
-#include "folly/Format-inl.h"
+#include <folly/Format-inl.h>
 
 #pragma GCC diagnostic pop
 
diff --git a/folly/FormatArg.h b/folly/FormatArg.h
index fda872d3..e8150646 100644
--- a/folly/FormatArg.h
+++ b/folly/FormatArg.h
@@ -18,10 +18,10 @@
 #define FOLLY_FORMATARG_H_
 
 #include <stdexcept>
-#include "folly/Conv.h"
-#include "folly/Likely.h"
-#include "folly/Portability.h"
-#include "folly/Range.h"
+#include <folly/Conv.h>
+#include <folly/Likely.h>
+#include <folly/Portability.h>
+#include <folly/Range.h>
 
 namespace folly {
 
diff --git a/folly/GroupVarint.cpp b/folly/GroupVarint.cpp
index 1d8e63f7..9a9ce3b1 100644
--- a/folly/GroupVarint.cpp
+++ b/folly/GroupVarint.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/GroupVarint.h"
+#include <folly/GroupVarint.h>
 
 #if HAVE_GROUP_VARINT
 namespace folly {
diff --git a/folly/GroupVarint.h b/folly/GroupVarint.h
index 5c506a2f..1115f550 100644
--- a/folly/GroupVarint.h
+++ b/folly/GroupVarint.h
@@ -21,16 +21,16 @@
 #error GroupVarint.h requires GCC
 #endif
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 #if FOLLY_X64 || defined(__i386__)
 #define HAVE_GROUP_VARINT 1
 
 #include <cstdint>
 #include <limits>
-#include "folly/detail/GroupVarintDetail.h"
-#include "folly/Bits.h"
-#include "folly/Range.h"
+#include <folly/detail/GroupVarintDetail.h>
+#include <folly/Bits.h>
+#include <folly/Range.h>
 #include <glog/logging.h>
 
 #ifdef __SSSE3__
diff --git a/folly/Hash.h b/folly/Hash.h
index a57bbbe0..e372a862 100644
--- a/folly/Hash.h
+++ b/folly/Hash.h
@@ -23,8 +23,8 @@
 #include <utility>
 #include <tuple>
 
-#include "folly/SpookyHashV1.h"
-#include "folly/SpookyHashV2.h"
+#include <folly/SpookyHashV1.h>
+#include <folly/SpookyHashV2.h>
 
 /*
  * Various hashing functions.
diff --git a/folly/IPAddress.cpp b/folly/IPAddress.cpp
index 9e902a1d..01642104 100644
--- a/folly/IPAddress.cpp
+++ b/folly/IPAddress.cpp
@@ -21,7 +21,7 @@
 #include <string>
 #include <vector>
 
-#include "folly/String.h"
+#include <folly/String.h>
 
 using std::ostream;
 using std::string;
diff --git a/folly/IPAddress.h b/folly/IPAddress.h
index c5f57aad..46c09657 100644
--- a/folly/IPAddress.h
+++ b/folly/IPAddress.h
@@ -24,12 +24,12 @@
 
 #include <boost/operators.hpp>
 
-#include "folly/Format.h"
-#include "folly/Range.h"
-#include "folly/IPAddressException.h"
-#include "folly/IPAddressV4.h"
-#include "folly/IPAddressV6.h"
-#include "folly/detail/IPAddress.h"
+#include <folly/Format.h>
+#include <folly/Range.h>
+#include <folly/IPAddressException.h>
+#include <folly/IPAddressV4.h>
+#include <folly/IPAddressV6.h>
+#include <folly/detail/IPAddress.h>
 
 namespace folly {
 
diff --git a/folly/IPAddressException.h b/folly/IPAddressException.h
index 8aa4a9b6..4b15855a 100644
--- a/folly/IPAddressException.h
+++ b/folly/IPAddressException.h
@@ -19,8 +19,8 @@
 #include <exception>
 #include <string>
 
-#include "folly/Conv.h"
-#include "folly/detail/IPAddress.h"
+#include <folly/Conv.h>
+#include <folly/detail/IPAddress.h>
 
 namespace folly {
 
diff --git a/folly/IPAddressV4.cpp b/folly/IPAddressV4.cpp
index e42416b9..625d54fa 100644
--- a/folly/IPAddressV4.cpp
+++ b/folly/IPAddressV4.cpp
@@ -19,9 +19,9 @@
 #include <ostream>
 #include <string>
 
-#include "folly/Format.h"
-#include "folly/IPAddress.h"
-#include "folly/IPAddressV6.h"
+#include <folly/Format.h>
+#include <folly/IPAddress.h>
+#include <folly/IPAddressV6.h>
 
 using std::ostream;
 using std::string;
diff --git a/folly/IPAddressV4.h b/folly/IPAddressV4.h
index 98198a3d..42f5002d 100644
--- a/folly/IPAddressV4.h
+++ b/folly/IPAddressV4.h
@@ -21,9 +21,9 @@
 
 #include <boost/operators.hpp>
 
-#include "folly/Hash.h"
-#include "folly/Range.h"
-#include "folly/detail/IPAddress.h"
+#include <folly/Hash.h>
+#include <folly/Range.h>
+#include <folly/detail/IPAddress.h>
 
 namespace folly {
 
diff --git a/folly/IPAddressV6.cpp b/folly/IPAddressV6.cpp
index 65101d44..f07238d3 100644
--- a/folly/IPAddressV6.cpp
+++ b/folly/IPAddressV6.cpp
@@ -19,10 +19,10 @@
 #include <ostream>
 #include <string>
 
-#include "folly/Format.h"
-#include "folly/IPAddress.h"
-#include "folly/IPAddressV4.h"
-#include "folly/MacAddress.h"
+#include <folly/Format.h>
+#include <folly/IPAddress.h>
+#include <folly/IPAddressV4.h>
+#include <folly/MacAddress.h>
 
 using std::ostream;
 using std::string;
diff --git a/folly/IPAddressV6.h b/folly/IPAddressV6.h
index 134d6de9..6ef438d5 100644
--- a/folly/IPAddressV6.h
+++ b/folly/IPAddressV6.h
@@ -23,9 +23,9 @@
 
 #include <boost/operators.hpp>
 
-#include "folly/Hash.h"
-#include "folly/Range.h"
-#include "folly/detail/IPAddress.h"
+#include <folly/Hash.h>
+#include <folly/Range.h>
+#include <folly/detail/IPAddress.h>
 
 namespace folly {
 
diff --git a/folly/Lazy.h b/folly/Lazy.h
index 886a1eb2..bb6411f8 100644
--- a/folly/Lazy.h
+++ b/folly/Lazy.h
@@ -19,7 +19,7 @@
 #include <utility>
 #include <type_traits>
 
-#include "folly/Optional.h"
+#include <folly/Optional.h>
 
 namespace folly {
 
diff --git a/folly/LifoSem.h b/folly/LifoSem.h
index 61c7b560..3a6313a0 100644
--- a/folly/LifoSem.h
+++ b/folly/LifoSem.h
@@ -24,11 +24,11 @@
 #include <memory>
 #include <system_error>
 
-#include "folly/AtomicStruct.h"
-#include "folly/Baton.h"
-#include "folly/IndexedMemPool.h"
-#include "folly/Likely.h"
-#include "folly/detail/CacheLocality.h"
+#include <folly/AtomicStruct.h>
+#include <folly/Baton.h>
+#include <folly/IndexedMemPool.h>
+#include <folly/Likely.h>
+#include <folly/detail/CacheLocality.h>
 
 namespace folly {
 
diff --git a/folly/MPMCPipeline.h b/folly/MPMCPipeline.h
index 4eae1643..63e686d8 100644
--- a/folly/MPMCPipeline.h
+++ b/folly/MPMCPipeline.h
@@ -20,7 +20,7 @@
 
 #include <glog/logging.h>
 
-#include "folly/detail/MPMCPipelineDetail.h"
+#include <folly/detail/MPMCPipelineDetail.h>
 
 namespace folly {
 
diff --git a/folly/MacAddress.cpp b/folly/MacAddress.cpp
index 67934d77..b8aa1afe 100644
--- a/folly/MacAddress.cpp
+++ b/folly/MacAddress.cpp
@@ -16,8 +16,8 @@
 
 #include "MacAddress.h"
 
-#include "folly/Exception.h"
-#include "folly/IPAddressV6.h"
+#include <folly/Exception.h>
+#include <folly/IPAddressV6.h>
 
 using std::invalid_argument;
 using std::string;
diff --git a/folly/MacAddress.h b/folly/MacAddress.h
index fbc9bd28..7ef35fa2 100644
--- a/folly/MacAddress.h
+++ b/folly/MacAddress.h
@@ -20,8 +20,8 @@
 
 #include <boost/operators.hpp>
 
-#include "folly/Bits.h"
-#include "folly/Conv.h"
+#include <folly/Bits.h>
+#include <folly/Conv.h>
 
 namespace folly {
 
diff --git a/folly/Malloc.cpp b/folly/Malloc.cpp
index 77a96d9a..fe8d8b6a 100644
--- a/folly/Malloc.cpp
+++ b/folly/Malloc.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Malloc.h"
+#include <folly/Malloc.h>
 
 namespace folly {
 
diff --git a/folly/Malloc.h b/folly/Malloc.h
index b8b2e204..b8ee18c5 100644
--- a/folly/Malloc.h
+++ b/folly/Malloc.h
@@ -26,7 +26,7 @@
 // includes and uses fbstring.
 #if defined(_GLIBCXX_USE_FB) && !defined(_LIBSTDCXX_FBSTRING)
 
-#include "folly/detail/Malloc.h"
+#include <folly/detail/Malloc.h>
 
 #include <string>
 namespace folly {
@@ -59,8 +59,8 @@ __attribute__((weak));
 #include <bits/functexcept.h>
 #define FOLLY_HAVE_MALLOC_H 1
 #else
-#include "folly/detail/Malloc.h"
-#include "folly/Portability.h"
+#include <folly/detail/Malloc.h>
+#include <folly/Portability.h>
 #endif
 
 // for malloc_usable_size
diff --git a/folly/Memory.h b/folly/Memory.h
index 625c466e..6270cfab 100644
--- a/folly/Memory.h
+++ b/folly/Memory.h
@@ -17,7 +17,7 @@
 #ifndef FOLLY_MEMORY_H_
 #define FOLLY_MEMORY_H_
 
-#include "folly/Traits.h"
+#include <folly/Traits.h>
 
 #include <cstddef>
 #include <cstdlib>
diff --git a/folly/MemoryMapping.cpp b/folly/MemoryMapping.cpp
index a6ad326a..4e78b560 100644
--- a/folly/MemoryMapping.cpp
+++ b/folly/MemoryMapping.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "folly/MemoryMapping.h"
-#include "folly/Format.h"
-#include "folly/Portability.h"
+#include <folly/MemoryMapping.h>
+#include <folly/Format.h>
+#include <folly/Portability.h>
 
 #ifdef __linux__
-#include "folly/experimental/io/HugePages.h"
+#include <folly/experimental/io/HugePages.h>
 #endif
 
 #include <fcntl.h>
diff --git a/folly/MemoryMapping.h b/folly/MemoryMapping.h
index fa8d51a5..19ca243e 100644
--- a/folly/MemoryMapping.h
+++ b/folly/MemoryMapping.h
@@ -17,9 +17,9 @@
 #ifndef FOLLY_MEMORYMAPPING_H_
 #define FOLLY_MEMORYMAPPING_H_
 
-#include "folly/FBString.h"
-#include "folly/File.h"
-#include "folly/Range.h"
+#include <folly/FBString.h>
+#include <folly/File.h>
+#include <folly/Range.h>
 #include <glog/logging.h>
 #include <boost/noncopyable.hpp>
 
diff --git a/folly/Optional.h b/folly/Optional.h
index c155f10e..701d744e 100644
--- a/folly/Optional.h
+++ b/folly/Optional.h
@@ -61,7 +61,7 @@
 
 #include <boost/operators.hpp>
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 namespace folly {
 
diff --git a/folly/PackedSyncPtr.h b/folly/PackedSyncPtr.h
index fa9fbd5e..ca9e1215 100644
--- a/folly/PackedSyncPtr.h
+++ b/folly/PackedSyncPtr.h
@@ -17,7 +17,7 @@
 #ifndef FOLLY_PACKEDSYNCPTR_H_
 #define FOLLY_PACKEDSYNCPTR_H_
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 #if !FOLLY_X64
 # error "PackedSyncPtr is x64-specific code."
@@ -53,7 +53,7 @@
  * @author Jordan DeLong <delong.j@fb.com>
  */
 
-#include "folly/SmallLocks.h"
+#include <folly/SmallLocks.h>
 #include <type_traits>
 #include <glog/logging.h>
 
diff --git a/folly/Padded.h b/folly/Padded.h
index 3bf87a6c..504a0bc7 100644
--- a/folly/Padded.h
+++ b/folly/Padded.h
@@ -27,7 +27,7 @@
 
 #include <boost/iterator/iterator_adaptor.hpp>
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 /**
  * Code that aids in storing data aligned on block (possibly cache-line)
diff --git a/folly/Portability.h b/folly/Portability.h
index 989f11d5..7f88cf25 100644
--- a/folly/Portability.h
+++ b/folly/Portability.h
@@ -181,14 +181,14 @@ struct MaxAlign { char c; } __attribute__((aligned));
 #if FOLLY_HAVE_CLOCK_GETTIME
 #include <time.h>
 #else
-#include "folly/detail/Clock.h"
+#include <folly/detail/Clock.h>
 #endif
 
 // Provide our own std::__throw_* wrappers for platforms that don't have them
 #if FOLLY_HAVE_BITS_FUNCTEXCEPT_H
 #include <bits/functexcept.h>
 #else
-#include "folly/detail/FunctionalExcept.h"
+#include <folly/detail/FunctionalExcept.h>
 #endif
 
 #if defined(__cplusplus)
diff --git a/folly/RWSpinLock.h b/folly/RWSpinLock.h
index b3d4dd99..995c466f 100644
--- a/folly/RWSpinLock.h
+++ b/folly/RWSpinLock.h
@@ -106,7 +106,7 @@ pthread_rwlock_t Read        728698     24us       101ns     7.28ms     194us
 
 */
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 #if defined(__GNUC__) && \
   (defined(__i386) || FOLLY_X64 || \
@@ -125,7 +125,7 @@ pthread_rwlock_t Read        728698     24us       101ns     7.28ms     194us
 #include <sched.h>
 #include <glog/logging.h>
 
-#include "folly/Likely.h"
+#include <folly/Likely.h>
 
 namespace folly {
 
diff --git a/folly/Random.cpp b/folly/Random.cpp
index 1398bd08..a189c3fc 100644
--- a/folly/Random.cpp
+++ b/folly/Random.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Random.h"
+#include <folly/Random.h>
 
 #include <atomic>
 #include <unistd.h>
@@ -23,8 +23,8 @@
 #include <array>
 
 #include <glog/logging.h>
-#include "folly/File.h"
-#include "folly/FileUtil.h"
+#include <folly/File.h>
+#include <folly/FileUtil.h>
 
 namespace folly {
 
diff --git a/folly/Random.h b/folly/Random.h
index 09cf7a17..8930526e 100644
--- a/folly/Random.h
+++ b/folly/Random.h
@@ -20,7 +20,7 @@
 #include <type_traits>
 #include <random>
 #include <stdint.h>
-#include "folly/ThreadLocal.h"
+#include <folly/ThreadLocal.h>
 
 #if __GNUC_PREREQ(4, 8) && !defined(ANDROID)
 #include <ext/random>
@@ -253,6 +253,6 @@ inline uint32_t randomNumberSeed() {
 
 }
 
-#include "folly/Random-inl.h"
+#include <folly/Random-inl.h>
 
 #endif
diff --git a/folly/Range.cpp b/folly/Range.cpp
index 8a73e805..6bc09824 100644
--- a/folly/Range.cpp
+++ b/folly/Range.cpp
@@ -17,7 +17,7 @@
 // @author Mark Rabkin (mrabkin@fb.com)
 // @author Andrei Alexandrescu (andrei.alexandrescu@fb.com)
 
-#include "folly/Range.h"
+#include <folly/Range.h>
 
 #if FOLLY_HAVE_EMMINTRIN_H
 #include <emmintrin.h>  // __v16qi
diff --git a/folly/Range.h b/folly/Range.h
index 3d9e8d51..1bb0cb34 100644
--- a/folly/Range.h
+++ b/folly/Range.h
@@ -20,8 +20,8 @@
 #ifndef FOLLY_RANGE_H_
 #define FOLLY_RANGE_H_
 
-#include "folly/Portability.h"
-#include "folly/FBString.h"
+#include <folly/Portability.h>
+#include <folly/FBString.h>
 #include <algorithm>
 #include <boost/operators.hpp>
 #include <cstring>
@@ -42,9 +42,9 @@
 #include <bits/c++config.h>
 #endif
 
-#include "folly/CpuId.h"
-#include "folly/Traits.h"
-#include "folly/Likely.h"
+#include <folly/CpuId.h>
+#include <folly/Traits.h>
+#include <folly/Likely.h>
 
 // Ignore shadowing warnings within this file, so includers can use -Wshadow.
 #pragma GCC diagnostic push
diff --git a/folly/SafeAssert.cpp b/folly/SafeAssert.cpp
index 41cd1aa6..7d0b4208 100644
--- a/folly/SafeAssert.cpp
+++ b/folly/SafeAssert.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "folly/SafeAssert.h"
+#include <folly/SafeAssert.h>
 
-#include "folly/Conv.h"
-#include "folly/FileUtil.h"
+#include <folly/Conv.h>
+#include <folly/FileUtil.h>
 
 namespace folly { namespace detail {
 
diff --git a/folly/SafeAssert.h b/folly/SafeAssert.h
index 1bac6c77..81a8ccdd 100644
--- a/folly/SafeAssert.h
+++ b/folly/SafeAssert.h
@@ -17,8 +17,8 @@
 #ifndef FOLLY_SAFEASSERT_H_
 #define FOLLY_SAFEASSERT_H_
 
-#include "folly/Portability.h"
-#include "folly/Preprocessor.h"
+#include <folly/Portability.h>
+#include <folly/Preprocessor.h>
 
 /**
  * Verify that the expression is true. If not, prints an error message
diff --git a/folly/ScopeGuard.h b/folly/ScopeGuard.h
index 1eeab8ee..9a65811d 100644
--- a/folly/ScopeGuard.h
+++ b/folly/ScopeGuard.h
@@ -21,8 +21,8 @@
 #include <functional>
 #include <new>
 
-#include "folly/Preprocessor.h"
-#include "folly/detail/UncaughtExceptionCounter.h"
+#include <folly/Preprocessor.h>
+#include <folly/detail/UncaughtExceptionCounter.h>
 
 namespace folly {
 
diff --git a/folly/SmallLocks.h b/folly/SmallLocks.h
index b8f081a6..1e2915d5 100644
--- a/folly/SmallLocks.h
+++ b/folly/SmallLocks.h
@@ -44,7 +44,7 @@
 #include <mutex>
 
 #include <glog/logging.h>
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 #if !FOLLY_X64
 # error "SmallLocks.h is currently x64-only."
diff --git a/folly/SpookyHashV1.cpp b/folly/SpookyHashV1.cpp
index 78d940b5..c0885d24 100644
--- a/folly/SpookyHashV1.cpp
+++ b/folly/SpookyHashV1.cpp
@@ -24,7 +24,7 @@
 //   July 12 2012: was passing out variables in final to in/out in short
 //   July 30 2012: I reintroduced the buffer overflow
 
-#include "folly/SpookyHashV1.h"
+#include <folly/SpookyHashV1.h>
 
 #include <cstring>
 
diff --git a/folly/SpookyHashV2.cpp b/folly/SpookyHashV2.cpp
index dd7d21b9..c7ecaf6a 100644
--- a/folly/SpookyHashV2.cpp
+++ b/folly/SpookyHashV2.cpp
@@ -25,7 +25,7 @@
 //   July 30 2012: I reintroduced the buffer overflow
 //   August 5 2012: SpookyV2: d = should be d += in short hash, and remove extra mix from long hash
 
-#include "folly/SpookyHashV2.h"
+#include <folly/SpookyHashV2.h>
 
 #include <cstring>
 
diff --git a/folly/String.cpp b/folly/String.cpp
index f50d1de8..c80c6821 100644
--- a/folly/String.cpp
+++ b/folly/String.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/String.h"
-#include "folly/Format.h"
+#include <folly/String.h>
+#include <folly/Format.h>
 
 #include <cerrno>
 #include <cstdarg>
diff --git a/folly/String.h b/folly/String.h
index d59477f0..f597291f 100644
--- a/folly/String.h
+++ b/folly/String.h
@@ -31,13 +31,13 @@
 #include <unordered_set>
 #include <unordered_map>
 
-#include "folly/Conv.h"
-#include "folly/Demangle.h"
-#include "folly/FBString.h"
-#include "folly/FBVector.h"
-#include "folly/Portability.h"
-#include "folly/Range.h"
-#include "folly/ScopeGuard.h"
+#include <folly/Conv.h>
+#include <folly/Demangle.h>
+#include <folly/FBString.h>
+#include <folly/FBVector.h>
+#include <folly/Portability.h>
+#include <folly/Range.h>
+#include <folly/ScopeGuard.h>
 
 // Compatibility function, to make sure toStdString(s) can be called
 // to convert a std::string or fbstring variable s into type std::string
@@ -543,6 +543,6 @@ struct has_nothrow_constructor<folly::basic_fbstring<T> > : true_type {
 };
 } // namespace boost
 
-#include "folly/String-inl.h"
+#include <folly/String-inl.h>
 
 #endif
diff --git a/folly/Subprocess.cpp b/folly/Subprocess.cpp
index b1dd0b35..08d93b4a 100644
--- a/folly/Subprocess.cpp
+++ b/folly/Subprocess.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Subprocess.h"
+#include <folly/Subprocess.h>
 
 #if __linux__
 #include <sys/prctl.h>
@@ -36,12 +36,12 @@
 
 #include <glog/logging.h>
 
-#include "folly/Conv.h"
-#include "folly/Exception.h"
-#include "folly/FileUtil.h"
-#include "folly/ScopeGuard.h"
-#include "folly/String.h"
-#include "folly/io/Cursor.h"
+#include <folly/Conv.h>
+#include <folly/Exception.h>
+#include <folly/FileUtil.h>
+#include <folly/ScopeGuard.h>
+#include <folly/String.h>
+#include <folly/io/Cursor.h>
 
 extern char** environ;
 
diff --git a/folly/Subprocess.h b/folly/Subprocess.h
index 8af7c639..e1fed9f7 100644
--- a/folly/Subprocess.h
+++ b/folly/Subprocess.h
@@ -70,10 +70,10 @@
 #include <boost/operators.hpp>
 #include <boost/noncopyable.hpp>
 
-#include "folly/io/IOBufQueue.h"
-#include "folly/MapUtil.h"
-#include "folly/Portability.h"
-#include "folly/Range.h"
+#include <folly/io/IOBufQueue.h>
+#include <folly/MapUtil.h>
+#include <folly/Portability.h>
+#include <folly/Range.h>
 
 namespace folly {
 
diff --git a/folly/Synchronized.h b/folly/Synchronized.h
index 83e59e80..83ca833d 100644
--- a/folly/Synchronized.h
+++ b/folly/Synchronized.h
@@ -27,8 +27,8 @@
 #include <type_traits>
 #include <mutex>
 #include <boost/thread.hpp>
-#include "folly/Preprocessor.h"
-#include "folly/Traits.h"
+#include <folly/Preprocessor.h>
+#include <folly/Traits.h>
 
 namespace folly {
 
diff --git a/folly/ThreadCachedArena.cpp b/folly/ThreadCachedArena.cpp
index 107bf99d..bcc2ff8e 100644
--- a/folly/ThreadCachedArena.cpp
+++ b/folly/ThreadCachedArena.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/ThreadCachedArena.h"
+#include <folly/ThreadCachedArena.h>
 
 namespace folly {
 
diff --git a/folly/ThreadCachedArena.h b/folly/ThreadCachedArena.h
index efc54bd6..bb48478e 100644
--- a/folly/ThreadCachedArena.h
+++ b/folly/ThreadCachedArena.h
@@ -22,9 +22,9 @@
 #include <limits>
 #include <boost/intrusive/slist.hpp>
 
-#include "folly/Likely.h"
-#include "folly/Arena.h"
-#include "folly/ThreadLocal.h"
+#include <folly/Likely.h>
+#include <folly/Arena.h>
+#include <folly/ThreadLocal.h>
 
 namespace folly {
 
diff --git a/folly/ThreadCachedInt.h b/folly/ThreadCachedInt.h
index 698e3bbc..d573ed65 100644
--- a/folly/ThreadCachedInt.h
+++ b/folly/ThreadCachedInt.h
@@ -27,8 +27,8 @@
 
 #include <boost/noncopyable.hpp>
 
-#include "folly/Likely.h"
-#include "folly/ThreadLocal.h"
+#include <folly/Likely.h>
+#include <folly/ThreadLocal.h>
 
 namespace folly {
 
diff --git a/folly/ThreadLocal.h b/folly/ThreadLocal.h
index 05d26bfb..ad111168 100644
--- a/folly/ThreadLocal.h
+++ b/folly/ThreadLocal.h
@@ -37,9 +37,9 @@
 #ifndef FOLLY_THREADLOCAL_H_
 #define FOLLY_THREADLOCAL_H_
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 #include <boost/iterator/iterator_facade.hpp>
-#include "folly/Likely.h"
+#include <folly/Likely.h>
 #include <type_traits>
 
 
@@ -50,7 +50,7 @@ enum class TLPDestructionMode {
 };
 }  // namespace
 
-#include "folly/detail/ThreadLocalDetail.h"
+#include <folly/detail/ThreadLocalDetail.h>
 
 namespace folly {
 
diff --git a/folly/TimeoutQueue.cpp b/folly/TimeoutQueue.cpp
index 2c5059ce..0a840d88 100644
--- a/folly/TimeoutQueue.cpp
+++ b/folly/TimeoutQueue.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/TimeoutQueue.h"
+#include <folly/TimeoutQueue.h>
 #include <algorithm>
 #include <vector>
 
diff --git a/folly/Traits.h b/folly/Traits.h
index bfdf8c70..2b94df13 100644
--- a/folly/Traits.h
+++ b/folly/Traits.h
@@ -24,7 +24,7 @@
 #include <type_traits>
 #include <functional>
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 // libc++ doesn't provide this header, nor does msvc
 #ifdef FOLLY_HAVE_BITS_CXXCONFIG_H
diff --git a/folly/Unicode.cpp b/folly/Unicode.cpp
index 7e2c247a..5e4c1a64 100644
--- a/folly/Unicode.cpp
+++ b/folly/Unicode.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Unicode.h"
+#include <folly/Unicode.h>
 
 namespace folly {
 
diff --git a/folly/Unicode.h b/folly/Unicode.h
index 1ed35133..f912baeb 100644
--- a/folly/Unicode.h
+++ b/folly/Unicode.h
@@ -19,7 +19,7 @@
 #ifndef FOLLY_UNICODE_H_
 #define FOLLY_UNICODE_H_
 
-#include "folly/FBString.h"
+#include <folly/FBString.h>
 
 namespace folly {
 
diff --git a/folly/Uri-inl.h b/folly/Uri-inl.h
index 3fb692e9..629fc07a 100644
--- a/folly/Uri-inl.h
+++ b/folly/Uri-inl.h
@@ -18,7 +18,7 @@
 #error This file may only be included from folly/Uri.h
 #endif
 
-#include "folly/Conv.h"
+#include <folly/Conv.h>
 
 namespace folly {
 
diff --git a/folly/Uri.cpp b/folly/Uri.cpp
index 30106c9f..5b2c155b 100644
--- a/folly/Uri.cpp
+++ b/folly/Uri.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Uri.h"
+#include <folly/Uri.h>
 
 #include <ctype.h>
 #include <boost/regex.hpp>
diff --git a/folly/Uri.h b/folly/Uri.h
index 5e765309..e7b38615 100644
--- a/folly/Uri.h
+++ b/folly/Uri.h
@@ -17,7 +17,7 @@
 #ifndef FOLLY_URI_H_
 #define FOLLY_URI_H_
 
-#include "folly/String.h"
+#include <folly/String.h>
 
 namespace folly {
 
@@ -90,6 +90,6 @@ class Uri {
 
 }  // namespace folly
 
-#include "folly/Uri-inl.h"
+#include <folly/Uri-inl.h>
 
 #endif /* FOLLY_URI_H_ */
diff --git a/folly/Varint.h b/folly/Varint.h
index 4ad1cc77..9bc7c49a 100644
--- a/folly/Varint.h
+++ b/folly/Varint.h
@@ -17,7 +17,7 @@
 #ifndef FOLLY_VARINT_H_
 #define FOLLY_VARINT_H_
 
-#include "folly/Range.h"
+#include <folly/Range.h>
 
 namespace folly {
 
diff --git a/folly/build/GenerateFingerprintTables.cpp b/folly/build/GenerateFingerprintTables.cpp
index 682e1b04..3ebb99bc 100644
--- a/folly/build/GenerateFingerprintTables.cpp
+++ b/folly/build/GenerateFingerprintTables.cpp
@@ -26,9 +26,9 @@
 #include <glog/logging.h>
 #include <gflags/gflags.h>
 
-#include "folly/Format.h"
+#include <folly/Format.h>
 
-#include "folly/detail/FingerprintPolynomial.h"
+#include <folly/detail/FingerprintPolynomial.h>
 
 using namespace folly;
 using namespace folly::detail;
@@ -134,7 +134,7 @@ int main(int argc, char *argv[]) {
       " * AUTOMATICALLY GENERATED.  DO NOT EDIT.\n"
       " */\n"
       "\n"
-      "#include \"folly/Fingerprint.h\"\n"
+      "#include <folly/Fingerprint.h>\n"
       "\n"
       "namespace folly {\n"
       "namespace detail {\n"
diff --git a/folly/build/generate_format_tables.py b/folly/build/generate_format_tables.py
index e464ed2a..c4255eca 100755
--- a/folly/build/generate_format_tables.py
+++ b/folly/build/generate_format_tables.py
@@ -43,7 +43,7 @@ def binary_values():
     return (tuple("{0:08b}".format(x)) for x in xrange(256))
 
 def generate(f):
-    f.write("#include \"folly/FormatArg.h\"\n"
+    f.write("#include <folly/FormatArg.h>\n"
             "\n"
             "namespace folly {\n"
             "namespace detail {\n"
diff --git a/folly/build/generate_varint_tables.py b/folly/build/generate_varint_tables.py
index 60fe683e..8fe9cd79 100755
--- a/folly/build/generate_varint_tables.py
+++ b/folly/build/generate_varint_tables.py
@@ -52,7 +52,7 @@ OUTPUT_FILE = "GroupVarintTables.cpp"
 
 def generate(f):
     f.write("""
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 #if FOLLY_X64 || defined(__i386__)
 #include <stdint.h>
diff --git a/folly/detail/CacheLocality.cpp b/folly/detail/CacheLocality.cpp
index a5b93939..adb4561a 100644
--- a/folly/detail/CacheLocality.cpp
+++ b/folly/detail/CacheLocality.cpp
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-#include "folly/detail/CacheLocality.h"
+#include <folly/detail/CacheLocality.h>
 
 #define _GNU_SOURCE 1 // for RTLD_NOLOAD
 #include <dlfcn.h>
 #include <fstream>
 
-#include "folly/Conv.h"
-#include "folly/Exception.h"
-#include "folly/FileUtil.h"
-#include "folly/Format.h"
-#include "folly/ScopeGuard.h"
+#include <folly/Conv.h>
+#include <folly/Exception.h>
+#include <folly/FileUtil.h>
+#include <folly/Format.h>
+#include <folly/ScopeGuard.h>
 
 namespace folly { namespace detail {
 
diff --git a/folly/detail/CacheLocality.h b/folly/detail/CacheLocality.h
index 66a57889..e35703a0 100644
--- a/folly/detail/CacheLocality.h
+++ b/folly/detail/CacheLocality.h
@@ -25,8 +25,8 @@
 #include <string>
 #include <type_traits>
 #include <vector>
-#include "folly/Likely.h"
-#include "folly/Portability.h"
+#include <folly/Likely.h>
+#include <folly/Portability.h>
 
 namespace folly { namespace detail {
 
diff --git a/folly/detail/Clock.cpp b/folly/detail/Clock.cpp
index 834efbcc..f48266f2 100644
--- a/folly/detail/Clock.cpp
+++ b/folly/detail/Clock.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/detail/Clock.h"
+#include <folly/detail/Clock.h>
 
 #if __MACH__
 #include <errno.h>
diff --git a/folly/detail/Clock.h b/folly/detail/Clock.h
index c95e7b8a..34a61b65 100644
--- a/folly/detail/Clock.h
+++ b/folly/detail/Clock.h
@@ -21,7 +21,7 @@
 #include <cstdint>
 
 #ifndef FOLLY_NO_CONFIG
-#include "folly/folly-config.h"
+#include <folly/folly-config.h>
 #endif
 
 #if FOLLY_HAVE_CLOCK_GETTIME
diff --git a/folly/detail/FunctionalExcept.cpp b/folly/detail/FunctionalExcept.cpp
index e78841a7..f40e3328 100644
--- a/folly/detail/FunctionalExcept.cpp
+++ b/folly/detail/FunctionalExcept.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/detail/FunctionalExcept.h"
+#include <folly/detail/FunctionalExcept.h>
 
 #include <stdexcept>
 
diff --git a/folly/detail/FunctionalExcept.h b/folly/detail/FunctionalExcept.h
index e328617b..4c698c84 100644
--- a/folly/detail/FunctionalExcept.h
+++ b/folly/detail/FunctionalExcept.h
@@ -17,7 +17,7 @@
 #ifndef FOLLY_DETAIL_FUNCTIONAL_EXCEPT_H
 #define FOLLY_DETAIL_FUNCTIONAL_EXCEPT_H
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 FOLLY_NAMESPACE_STD_BEGIN
 
diff --git a/folly/detail/IPAddress.h b/folly/detail/IPAddress.h
index 476f1fa1..ef8b85a6 100644
--- a/folly/detail/IPAddress.h
+++ b/folly/detail/IPAddress.h
@@ -34,8 +34,8 @@ extern "C" {
 #include <sys/types.h>
 }
 
-#include "folly/Conv.h"
-#include "folly/Format.h"
+#include <folly/Conv.h>
+#include <folly/Format.h>
 
 namespace folly { namespace detail {
 
diff --git a/folly/detail/MPMCPipelineDetail.h b/folly/detail/MPMCPipelineDetail.h
index e34a0c9c..d2f9e372 100644
--- a/folly/detail/MPMCPipelineDetail.h
+++ b/folly/detail/MPMCPipelineDetail.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "folly/MPMCQueue.h"
+#include <folly/MPMCQueue.h>
 
 namespace folly {
 
diff --git a/folly/detail/Malloc.h b/folly/detail/Malloc.h
index c4ab1b2d..6b045b44 100644
--- a/folly/detail/Malloc.h
+++ b/folly/detail/Malloc.h
@@ -20,7 +20,7 @@
 #include <stdlib.h>
 
 #ifndef FOLLY_NO_CONFIG
-#include "folly/folly-config.h"
+#include <folly/folly-config.h>
 #endif
 
 extern "C" {
diff --git a/folly/detail/MallocImpl.cpp b/folly/detail/MallocImpl.cpp
index 6a322314..8f1bef07 100644
--- a/folly/detail/MallocImpl.cpp
+++ b/folly/detail/MallocImpl.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/detail/Malloc.h"
+#include <folly/detail/Malloc.h>
 
 extern "C" {
 
diff --git a/folly/detail/SlowFingerprint.h b/folly/detail/SlowFingerprint.h
index 42cc3a1b..c258e5f0 100644
--- a/folly/detail/SlowFingerprint.h
+++ b/folly/detail/SlowFingerprint.h
@@ -17,9 +17,9 @@
 #ifndef FOLLY_DETAIL_SLOWFINGERPRINT_H_
 #define FOLLY_DETAIL_SLOWFINGERPRINT_H_
 
-#include "folly/Fingerprint.h"
-#include "folly/detail/FingerprintPolynomial.h"
-#include "folly/Range.h"
+#include <folly/Fingerprint.h>
+#include <folly/detail/FingerprintPolynomial.h>
+#include <folly/Range.h>
 
 namespace folly {
 namespace detail {
diff --git a/folly/detail/ThreadLocalDetail.h b/folly/detail/ThreadLocalDetail.h
index b883861a..b1a380e7 100644
--- a/folly/detail/ThreadLocalDetail.h
+++ b/folly/detail/ThreadLocalDetail.h
@@ -26,9 +26,9 @@
 
 #include <glog/logging.h>
 
-#include "folly/Foreach.h"
-#include "folly/Exception.h"
-#include "folly/Malloc.h"
+#include <folly/Foreach.h>
+#include <folly/Exception.h>
+#include <folly/Malloc.h>
 
 namespace folly {
 namespace threadlocal_detail {
diff --git a/folly/dynamic-inl.h b/folly/dynamic-inl.h
index 204d48f9..35378bd5 100644
--- a/folly/dynamic-inl.h
+++ b/folly/dynamic-inl.h
@@ -20,9 +20,9 @@
 #include <functional>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/iterator/iterator_facade.hpp>
-#include "folly/Likely.h"
-#include "folly/Conv.h"
-#include "folly/Format.h"
+#include <folly/Likely.h>
+#include <folly/Conv.h>
+#include <folly/Format.h>
 
 //////////////////////////////////////////////////////////////////////
 
diff --git a/folly/dynamic.cpp b/folly/dynamic.cpp
index d03fc643..825cb775 100644
--- a/folly/dynamic.cpp
+++ b/folly/dynamic.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/dynamic.h"
+#include <folly/dynamic.h>
 
 namespace folly {
 
diff --git a/folly/dynamic.h b/folly/dynamic.h
index d388ce72..0e03f8f4 100644
--- a/folly/dynamic.h
+++ b/folly/dynamic.h
@@ -75,9 +75,9 @@
 
 #include <boost/operators.hpp>
 
-#include "folly/FBString.h"
-#include "folly/Range.h"
-#include "folly/Traits.h"
+#include <folly/FBString.h>
+#include <folly/Range.h>
+#include <folly/Traits.h>
 
 namespace folly {
 
@@ -524,6 +524,6 @@ private:
 
 }
 
-#include "folly/dynamic-inl.h"
+#include <folly/dynamic-inl.h>
 
 #endif
diff --git a/folly/experimental/Bits.h b/folly/experimental/Bits.h
index 36770105..e0376a5b 100644
--- a/folly/experimental/Bits.h
+++ b/folly/experimental/Bits.h
@@ -21,9 +21,9 @@
 #include <type_traits>
 #include <limits>
 
-#include "folly/Bits.h"
-#include "folly/Portability.h"
-#include "folly/Range.h"
+#include <folly/Bits.h>
+#include <folly/Portability.h>
+#include <folly/Range.h>
 
 namespace folly {
 
diff --git a/folly/experimental/EliasFanoCoding.h b/folly/experimental/EliasFanoCoding.h
index f5222f8c..23e96390 100644
--- a/folly/experimental/EliasFanoCoding.h
+++ b/folly/experimental/EliasFanoCoding.h
@@ -39,10 +39,10 @@
 #include <boost/noncopyable.hpp>
 #include <glog/logging.h>
 
-#include "folly/Bits.h"
-#include "folly/CpuId.h"
-#include "folly/Likely.h"
-#include "folly/Range.h"
+#include <folly/Bits.h>
+#include <folly/CpuId.h>
+#include <folly/Likely.h>
+#include <folly/Range.h>
 
 #if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
 #error EliasFanoCoding.h requires little endianness
diff --git a/folly/experimental/EventCount.h b/folly/experimental/EventCount.h
index 437d1f76..df6722ea 100644
--- a/folly/experimental/EventCount.h
+++ b/folly/experimental/EventCount.h
@@ -26,8 +26,8 @@
 #include <atomic>
 #include <thread>
 
-#include "folly/Bits.h"
-#include "folly/Likely.h"
+#include <folly/Bits.h>
+#include <folly/Likely.h>
 
 
 namespace folly {
diff --git a/folly/experimental/TestUtil.cpp b/folly/experimental/TestUtil.cpp
index 095489e4..7f006a2c 100644
--- a/folly/experimental/TestUtil.cpp
+++ b/folly/experimental/TestUtil.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/TestUtil.h"
+#include <folly/experimental/TestUtil.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "folly/Conv.h"
-#include "folly/Exception.h"
+#include <folly/Conv.h>
+#include <folly/Exception.h>
 
 namespace folly {
 namespace test {
diff --git a/folly/experimental/TestUtil.h b/folly/experimental/TestUtil.h
index 9716f74e..1b5eb660 100644
--- a/folly/experimental/TestUtil.h
+++ b/folly/experimental/TestUtil.h
@@ -18,8 +18,8 @@
 #define FOLLY_TESTUTIL_H_
 
 #include <string>
-#include "folly/Range.h"
-#include "folly/experimental/io/FsUtil.h"
+#include <folly/Range.h>
+#include <folly/experimental/io/FsUtil.h>
 
 namespace folly {
 namespace test {
diff --git a/folly/experimental/exception_tracer/ExceptionTracer.cpp b/folly/experimental/exception_tracer/ExceptionTracer.cpp
index 04d3b55e..78b60ea0 100644
--- a/folly/experimental/exception_tracer/ExceptionTracer.cpp
+++ b/folly/experimental/exception_tracer/ExceptionTracer.cpp
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/exception_tracer/ExceptionTracer.h"
+#include <folly/experimental/exception_tracer/ExceptionTracer.h>
 
 #include <dlfcn.h>
 #include <exception>
 #include <iostream>
 #include <glog/logging.h>
 
-#include "folly/experimental/exception_tracer/ExceptionAbi.h"
-#include "folly/experimental/exception_tracer/StackTrace.h"
-#include "folly/experimental/symbolizer/Symbolizer.h"
-#include "folly/String.h"
+#include <folly/experimental/exception_tracer/ExceptionAbi.h>
+#include <folly/experimental/exception_tracer/StackTrace.h>
+#include <folly/experimental/symbolizer/Symbolizer.h>
+#include <folly/String.h>
 
 namespace {
 
diff --git a/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp b/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp
index c8614293..a9c80bf0 100644
--- a/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp
+++ b/folly/experimental/exception_tracer/ExceptionTracerBenchmark.cpp
@@ -21,8 +21,8 @@
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 
-#include "folly/Benchmark.h"
-#include "folly/experimental/exception_tracer/ExceptionTracer.h"
+#include <folly/Benchmark.h>
+#include <folly/experimental/exception_tracer/ExceptionTracer.h>
 
 void recurse(int level) {
   if (level == 0) {
diff --git a/folly/experimental/exception_tracer/ExceptionTracerLib.cpp b/folly/experimental/exception_tracer/ExceptionTracerLib.cpp
index e13774af..8643623d 100644
--- a/folly/experimental/exception_tracer/ExceptionTracerLib.cpp
+++ b/folly/experimental/exception_tracer/ExceptionTracerLib.cpp
@@ -20,11 +20,11 @@
 
 #include <glog/logging.h>
 
-#include "folly/Portability.h"
-#include "folly/experimental/exception_tracer/StackTrace.h"
-#include "folly/experimental/exception_tracer/ExceptionAbi.h"
-#include "folly/experimental/exception_tracer/ExceptionTracer.h"
-#include "folly/experimental/symbolizer/Symbolizer.h"
+#include <folly/Portability.h>
+#include <folly/experimental/exception_tracer/StackTrace.h>
+#include <folly/experimental/exception_tracer/ExceptionAbi.h>
+#include <folly/experimental/exception_tracer/ExceptionTracer.h>
+#include <folly/experimental/symbolizer/Symbolizer.h>
 
 namespace __cxxabiv1 {
 
diff --git a/folly/experimental/exception_tracer/ExceptionTracerTest.cpp b/folly/experimental/exception_tracer/ExceptionTracerTest.cpp
index 1be5c147..043ddb8d 100644
--- a/folly/experimental/exception_tracer/ExceptionTracerTest.cpp
+++ b/folly/experimental/exception_tracer/ExceptionTracerTest.cpp
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "folly/experimental/exception_tracer/ExceptionTracer.h"
+#include <folly/experimental/exception_tracer/ExceptionTracer.h>
 
 void bar() {
   throw std::runtime_error("hello");
diff --git a/folly/experimental/exception_tracer/StackTrace.cpp b/folly/experimental/exception_tracer/StackTrace.cpp
index 6bb019a0..59393b09 100644
--- a/folly/experimental/exception_tracer/StackTrace.cpp
+++ b/folly/experimental/exception_tracer/StackTrace.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/exception_tracer/StackTrace.h"
+#include <folly/experimental/exception_tracer/StackTrace.h>
 
 #include <cassert>
 #include <cstdlib>
 #include <new>
-#include "folly/experimental/symbolizer/StackTrace.h"
+#include <folly/experimental/symbolizer/StackTrace.h>
 
 namespace folly { namespace exception_tracer {
 
diff --git a/folly/experimental/io/AsyncIO.cpp b/folly/experimental/io/AsyncIO.cpp
index 1a4273df..7e7be271 100644
--- a/folly/experimental/io/AsyncIO.cpp
+++ b/folly/experimental/io/AsyncIO.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/io/AsyncIO.h"
+#include <folly/experimental/io/AsyncIO.h>
 
 #include <sys/eventfd.h>
 #include <unistd.h>
@@ -26,10 +26,10 @@
 #include <boost/intrusive/parent_from_member.hpp>
 #include <glog/logging.h>
 
-#include "folly/Exception.h"
-#include "folly/Format.h"
-#include "folly/Likely.h"
-#include "folly/String.h"
+#include <folly/Exception.h>
+#include <folly/Format.h>
+#include <folly/Likely.h>
+#include <folly/String.h>
 
 namespace folly {
 
diff --git a/folly/experimental/io/AsyncIO.h b/folly/experimental/io/AsyncIO.h
index b595a325..6b629326 100644
--- a/folly/experimental/io/AsyncIO.h
+++ b/folly/experimental/io/AsyncIO.h
@@ -32,8 +32,8 @@
 
 #include <boost/noncopyable.hpp>
 
-#include "folly/Portability.h"
-#include "folly/Range.h"
+#include <folly/Portability.h>
+#include <folly/Range.h>
 
 namespace folly {
 
diff --git a/folly/experimental/io/FsUtil.cpp b/folly/experimental/io/FsUtil.cpp
index a51ee582..a0dfd892 100644
--- a/folly/experimental/io/FsUtil.cpp
+++ b/folly/experimental/io/FsUtil.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/io/FsUtil.h"
+#include <folly/experimental/io/FsUtil.h>
 
 namespace bsys = ::boost::system;
 
diff --git a/folly/experimental/io/HugePageUtil.cpp b/folly/experimental/io/HugePageUtil.cpp
index 1ce36986..b37bab1e 100644
--- a/folly/experimental/io/HugePageUtil.cpp
+++ b/folly/experimental/io/HugePageUtil.cpp
@@ -27,13 +27,13 @@
 
 #include <gflags/gflags.h>
 
-#include "folly/File.h"
-#include "folly/Format.h"
-#include "folly/MemoryMapping.h"
-#include "folly/Portability.h"
-#include "folly/Range.h"
-#include "folly/ScopeGuard.h"
-#include "folly/experimental/io/HugePages.h"
+#include <folly/File.h>
+#include <folly/Format.h>
+#include <folly/MemoryMapping.h>
+#include <folly/Portability.h>
+#include <folly/Range.h>
+#include <folly/ScopeGuard.h>
+#include <folly/experimental/io/HugePages.h>
 
 DEFINE_bool(cp, false, "Copy file");
 
diff --git a/folly/experimental/io/HugePages.cpp b/folly/experimental/io/HugePages.cpp
index 5b4a0706..67c8727e 100644
--- a/folly/experimental/io/HugePages.cpp
+++ b/folly/experimental/io/HugePages.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/io/HugePages.h"
+#include <folly/experimental/io/HugePages.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -32,15 +32,15 @@
 
 #include <glog/logging.h>
 
-#include "folly/Conv.h"
-#include "folly/Format.h"
-#include "folly/Range.h"
-#include "folly/ScopeGuard.h"
-#include "folly/String.h"
+#include <folly/Conv.h>
+#include <folly/Format.h>
+#include <folly/Range.h>
+#include <folly/ScopeGuard.h>
+#include <folly/String.h>
 
-#include "folly/gen/Base.h"
-#include "folly/gen/File.h"
-#include "folly/gen/String.h"
+#include <folly/gen/Base.h>
+#include <folly/gen/File.h>
+#include <folly/gen/String.h>
 
 namespace folly {
 
diff --git a/folly/experimental/io/HugePages.h b/folly/experimental/io/HugePages.h
index dcf07e7c..ee5605a7 100644
--- a/folly/experimental/io/HugePages.h
+++ b/folly/experimental/io/HugePages.h
@@ -27,8 +27,8 @@
 
 #include <boost/operators.hpp>
 
-#include "folly/Range.h"
-#include "folly/experimental/io/FsUtil.h"
+#include <folly/Range.h>
+#include <folly/experimental/io/FsUtil.h>
 
 namespace folly {
 
diff --git a/folly/experimental/io/test/AsyncIOTest.cpp b/folly/experimental/io/test/AsyncIOTest.cpp
index f823a813..7025eff5 100644
--- a/folly/experimental/io/test/AsyncIOTest.cpp
+++ b/folly/experimental/io/test/AsyncIOTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/io/AsyncIO.h"
+#include <folly/experimental/io/AsyncIO.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -31,9 +31,9 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/experimental/io/FsUtil.h"
-#include "folly/ScopeGuard.h"
-#include "folly/String.h"
+#include <folly/experimental/io/FsUtil.h>
+#include <folly/ScopeGuard.h>
+#include <folly/String.h>
 
 namespace fs = folly::fs;
 using folly::AsyncIO;
diff --git a/folly/experimental/io/test/FsUtilTest.cpp b/folly/experimental/io/test/FsUtilTest.cpp
index a0997dd5..5760bfcb 100644
--- a/folly/experimental/io/test/FsUtilTest.cpp
+++ b/folly/experimental/io/test/FsUtilTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/io/FsUtil.h"
+#include <folly/experimental/io/FsUtil.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
diff --git a/folly/experimental/symbolizer/Dwarf.cpp b/folly/experimental/symbolizer/Dwarf.cpp
index 4ce3c974..90938ae7 100644
--- a/folly/experimental/symbolizer/Dwarf.cpp
+++ b/folly/experimental/symbolizer/Dwarf.cpp
@@ -15,7 +15,7 @@
  */
 
 
-#include "folly/experimental/symbolizer/Dwarf.h"
+#include <folly/experimental/symbolizer/Dwarf.h>
 
 #include <type_traits>
 
diff --git a/folly/experimental/symbolizer/Dwarf.h b/folly/experimental/symbolizer/Dwarf.h
index acdc885d..820dd94a 100644
--- a/folly/experimental/symbolizer/Dwarf.h
+++ b/folly/experimental/symbolizer/Dwarf.h
@@ -21,8 +21,8 @@
 
 #include <boost/variant.hpp>
 
-#include "folly/experimental/symbolizer/Elf.h"
-#include "folly/Range.h"
+#include <folly/experimental/symbolizer/Elf.h>
+#include <folly/Range.h>
 
 namespace folly {
 namespace symbolizer {
diff --git a/folly/experimental/symbolizer/Elf.cpp b/folly/experimental/symbolizer/Elf.cpp
index 3d4db0eb..6f525f3f 100644
--- a/folly/experimental/symbolizer/Elf.cpp
+++ b/folly/experimental/symbolizer/Elf.cpp
@@ -15,7 +15,7 @@
  */
 
 
-#include "folly/experimental/symbolizer/Elf.h"
+#include <folly/experimental/symbolizer/Elf.h>
 
 #include <sys/mman.h>
 #include <sys/types.h>
@@ -26,8 +26,8 @@
 
 #include <glog/logging.h>
 
-#include "folly/Conv.h"
-#include "folly/Exception.h"
+#include <folly/Conv.h>
+#include <folly/Exception.h>
 
 namespace folly {
 namespace symbolizer {
diff --git a/folly/experimental/symbolizer/Elf.h b/folly/experimental/symbolizer/Elf.h
index 939c43f3..f1c49334 100644
--- a/folly/experimental/symbolizer/Elf.h
+++ b/folly/experimental/symbolizer/Elf.h
@@ -26,10 +26,10 @@
 #include <stdexcept>
 #include <system_error>
 
-#include "folly/Conv.h"
-#include "folly/Likely.h"
-#include "folly/Range.h"
-#include "folly/SafeAssert.h"
+#include <folly/Conv.h>
+#include <folly/Likely.h>
+#include <folly/Range.h>
+#include <folly/SafeAssert.h>
 
 namespace folly {
 namespace symbolizer {
@@ -233,7 +233,7 @@ class ElfFile {
 }  // namespace symbolizer
 }  // namespace folly
 
-#include "folly/experimental/symbolizer/Elf-inl.h"
+#include <folly/experimental/symbolizer/Elf-inl.h>
 
 #endif /* FOLLY_EXPERIMENTAL_SYMBOLIZER_ELF_H_ */
 
diff --git a/folly/experimental/symbolizer/ElfCache.cpp b/folly/experimental/symbolizer/ElfCache.cpp
index fd43474a..03fc36d0 100644
--- a/folly/experimental/symbolizer/ElfCache.cpp
+++ b/folly/experimental/symbolizer/ElfCache.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/symbolizer/ElfCache.h"
+#include <folly/experimental/symbolizer/ElfCache.h>
 
 namespace folly { namespace symbolizer {
 
diff --git a/folly/experimental/symbolizer/ElfCache.h b/folly/experimental/symbolizer/ElfCache.h
index a2d8993a..de3cd040 100644
--- a/folly/experimental/symbolizer/ElfCache.h
+++ b/folly/experimental/symbolizer/ElfCache.h
@@ -30,7 +30,7 @@
 #include <boost/intrusive/list.hpp>
 #include <glog/logging.h>
 
-#include "folly/experimental/symbolizer/Elf.h"
+#include <folly/experimental/symbolizer/Elf.h>
 
 namespace folly { namespace symbolizer {
 
diff --git a/folly/experimental/symbolizer/ElfUtil.cpp b/folly/experimental/symbolizer/ElfUtil.cpp
index 9faafd3c..6f6003db 100644
--- a/folly/experimental/symbolizer/ElfUtil.cpp
+++ b/folly/experimental/symbolizer/ElfUtil.cpp
@@ -15,7 +15,7 @@
  */
 
 
-#include "folly/experimental/symbolizer/Elf.h"
+#include <folly/experimental/symbolizer/Elf.h>
 
 #include <stdio.h>
 
diff --git a/folly/experimental/symbolizer/LineReader.cpp b/folly/experimental/symbolizer/LineReader.cpp
index 8769472f..ee249a87 100644
--- a/folly/experimental/symbolizer/LineReader.cpp
+++ b/folly/experimental/symbolizer/LineReader.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/symbolizer/LineReader.h"
+#include <folly/experimental/symbolizer/LineReader.h>
 
 #include <cstring>
 
-#include "folly/FileUtil.h"
+#include <folly/FileUtil.h>
 
 namespace folly { namespace symbolizer {
 
diff --git a/folly/experimental/symbolizer/LineReader.h b/folly/experimental/symbolizer/LineReader.h
index 07f54b24..1c1227dc 100644
--- a/folly/experimental/symbolizer/LineReader.h
+++ b/folly/experimental/symbolizer/LineReader.h
@@ -21,7 +21,7 @@
 
 #include <boost/noncopyable.hpp>
 
-#include "folly/Range.h"
+#include <folly/Range.h>
 
 namespace folly { namespace symbolizer {
 
diff --git a/folly/experimental/symbolizer/SignalHandler.cpp b/folly/experimental/symbolizer/SignalHandler.cpp
index 4a17ee04..952c7f33 100644
--- a/folly/experimental/symbolizer/SignalHandler.cpp
+++ b/folly/experimental/symbolizer/SignalHandler.cpp
@@ -16,7 +16,7 @@
 
 // This is heavily inspired by the signal handler from google-glog
 
-#include "folly/experimental/symbolizer/SignalHandler.h"
+#include <folly/experimental/symbolizer/SignalHandler.h>
 
 #include <sys/types.h>
 #include <atomic>
@@ -29,11 +29,11 @@
 
 #include <glog/logging.h>
 
-#include "folly/Conv.h"
-#include "folly/FileUtil.h"
-#include "folly/Portability.h"
-#include "folly/ScopeGuard.h"
-#include "folly/experimental/symbolizer/Symbolizer.h"
+#include <folly/Conv.h>
+#include <folly/FileUtil.h>
+#include <folly/Portability.h>
+#include <folly/ScopeGuard.h>
+#include <folly/experimental/symbolizer/Symbolizer.h>
 
 namespace folly { namespace symbolizer {
 
diff --git a/folly/experimental/symbolizer/StackTrace.cpp b/folly/experimental/symbolizer/StackTrace.cpp
index dde71705..863ccf5e 100644
--- a/folly/experimental/symbolizer/StackTrace.cpp
+++ b/folly/experimental/symbolizer/StackTrace.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/symbolizer/StackTrace.h"
+#include <folly/experimental/symbolizer/StackTrace.h>
 
 // Must be first to ensure that UNW_LOCAL_ONLY is defined
 #define UNW_LOCAL_ONLY 1
diff --git a/folly/experimental/symbolizer/Symbolizer.cpp b/folly/experimental/symbolizer/Symbolizer.cpp
index 51e97ff1..53519332 100644
--- a/folly/experimental/symbolizer/Symbolizer.cpp
+++ b/folly/experimental/symbolizer/Symbolizer.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/symbolizer/Symbolizer.h"
+#include <folly/experimental/symbolizer/Symbolizer.h>
 
 #include <limits.h>
 #include <cstdio>
@@ -26,14 +26,14 @@
 #include <ext/stdio_sync_filebuf.h>
 #endif
 
-#include "folly/Conv.h"
-#include "folly/FileUtil.h"
-#include "folly/ScopeGuard.h"
-#include "folly/String.h"
+#include <folly/Conv.h>
+#include <folly/FileUtil.h>
+#include <folly/ScopeGuard.h>
+#include <folly/String.h>
 
-#include "folly/experimental/symbolizer/Elf.h"
-#include "folly/experimental/symbolizer/Dwarf.h"
-#include "folly/experimental/symbolizer/LineReader.h"
+#include <folly/experimental/symbolizer/Elf.h>
+#include <folly/experimental/symbolizer/Dwarf.h>
+#include <folly/experimental/symbolizer/LineReader.h>
 
 
 namespace folly {
diff --git a/folly/experimental/symbolizer/Symbolizer.h b/folly/experimental/symbolizer/Symbolizer.h
index d10ab843..d3b0f03a 100644
--- a/folly/experimental/symbolizer/Symbolizer.h
+++ b/folly/experimental/symbolizer/Symbolizer.h
@@ -21,14 +21,14 @@
 #include <string>
 #include <unordered_map>
 
-#include "folly/FBString.h"
-#include "folly/Range.h"
-#include "folly/String.h"
-#include "folly/io/IOBuf.h"
-#include "folly/experimental/symbolizer/Elf.h"
-#include "folly/experimental/symbolizer/ElfCache.h"
-#include "folly/experimental/symbolizer/Dwarf.h"
-#include "folly/experimental/symbolizer/StackTrace.h"
+#include <folly/FBString.h>
+#include <folly/Range.h>
+#include <folly/String.h>
+#include <folly/io/IOBuf.h>
+#include <folly/experimental/symbolizer/Elf.h>
+#include <folly/experimental/symbolizer/ElfCache.h>
+#include <folly/experimental/symbolizer/Dwarf.h>
+#include <folly/experimental/symbolizer/StackTrace.h>
 
 namespace folly {
 namespace symbolizer {
diff --git a/folly/experimental/symbolizer/test/Crash.cpp b/folly/experimental/symbolizer/test/Crash.cpp
index 74eedad8..3a82b1e7 100644
--- a/folly/experimental/symbolizer/test/Crash.cpp
+++ b/folly/experimental/symbolizer/test/Crash.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/symbolizer/SignalHandler.h"
+#include <folly/experimental/symbolizer/SignalHandler.h>
 
 int main() {
   folly::symbolizer::installFatalSignalHandler();
diff --git a/folly/experimental/symbolizer/test/ElfTests.cpp b/folly/experimental/symbolizer/test/ElfTests.cpp
index 1b98888a..258ad992 100644
--- a/folly/experimental/symbolizer/test/ElfTests.cpp
+++ b/folly/experimental/symbolizer/test/ElfTests.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "folly/experimental/symbolizer/Elf.h"
+#include <folly/experimental/symbolizer/Elf.h>
 
 using folly::symbolizer::ElfFile;
 
diff --git a/folly/experimental/symbolizer/test/LineReaderTest.cpp b/folly/experimental/symbolizer/test/LineReaderTest.cpp
index dd99a282..1b58efe4 100644
--- a/folly/experimental/symbolizer/test/LineReaderTest.cpp
+++ b/folly/experimental/symbolizer/test/LineReaderTest.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/symbolizer/LineReader.h"
+#include <folly/experimental/symbolizer/LineReader.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/FileUtil.h"
-#include "folly/experimental/TestUtil.h"
+#include <folly/FileUtil.h>
+#include <folly/experimental/TestUtil.h>
 
 namespace folly { namespace symbolizer { namespace test {
 
diff --git a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
index 3fbb52a3..62ebf1e7 100644
--- a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
+++ b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/symbolizer/test/SignalHandlerTest.h"
-#include "folly/experimental/symbolizer/SignalHandler.h"
+#include <folly/experimental/symbolizer/test/SignalHandlerTest.h>
+#include <folly/experimental/symbolizer/SignalHandler.h>
 
 #include <gtest/gtest.h>
 
-#include "folly/FileUtil.h"
-#include "folly/Range.h"
-#include "folly/CPortability.h"
+#include <folly/FileUtil.h>
+#include <folly/Range.h>
+#include <folly/CPortability.h>
 
 namespace folly { namespace symbolizer { namespace test {
 
diff --git a/folly/experimental/symbolizer/test/StackTraceTest.cpp b/folly/experimental/symbolizer/test/StackTraceTest.cpp
index 7bd19df9..8123997a 100644
--- a/folly/experimental/symbolizer/test/StackTraceTest.cpp
+++ b/folly/experimental/symbolizer/test/StackTraceTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/symbolizer/StackTrace.h"
-#include "folly/experimental/symbolizer/Symbolizer.h"
+#include <folly/experimental/symbolizer/StackTrace.h>
+#include <folly/experimental/symbolizer/Symbolizer.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
diff --git a/folly/experimental/symbolizer/test/SymbolizerTest.cpp b/folly/experimental/symbolizer/test/SymbolizerTest.cpp
index 73862553..f980bbb7 100644
--- a/folly/experimental/symbolizer/test/SymbolizerTest.cpp
+++ b/folly/experimental/symbolizer/test/SymbolizerTest.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/symbolizer/Symbolizer.h"
+#include <folly/experimental/symbolizer/Symbolizer.h>
 
 #include <cstdlib>
 
 #include <gtest/gtest.h>
 
-#include "folly/Range.h"
-#include "folly/String.h"
+#include <folly/Range.h>
+#include <folly/String.h>
 
 namespace folly { namespace symbolizer { namespace test {
 
diff --git a/folly/experimental/test/BitsBenchmark.cpp b/folly/experimental/test/BitsBenchmark.cpp
index 80b728b0..454fddbd 100644
--- a/folly/experimental/test/BitsBenchmark.cpp
+++ b/folly/experimental/test/BitsBenchmark.cpp
@@ -18,8 +18,8 @@
 #include <random>
 #include <memory>
 
-#include "folly/Benchmark.h"
-#include "folly/experimental/Bits.h"
+#include <folly/Benchmark.h>
+#include <folly/experimental/Bits.h>
 
 std::random_device rd;
 
diff --git a/folly/experimental/test/BitsTest.cpp b/folly/experimental/test/BitsTest.cpp
index eb263f4e..9ac5bc82 100644
--- a/folly/experimental/test/BitsTest.cpp
+++ b/folly/experimental/test/BitsTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/Bits.h"
+#include <folly/experimental/Bits.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
diff --git a/folly/experimental/test/EliasFanoCodingTest.cpp b/folly/experimental/test/EliasFanoCodingTest.cpp
index 954a8129..80192359 100644
--- a/folly/experimental/test/EliasFanoCodingTest.cpp
+++ b/folly/experimental/test/EliasFanoCodingTest.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "folly/Benchmark.h"
-#include "folly/experimental/EliasFanoCoding.h"
-#include "folly/experimental/test/CodingTestUtils.h"
+#include <folly/Benchmark.h>
+#include <folly/experimental/EliasFanoCoding.h>
+#include <folly/experimental/test/CodingTestUtils.h>
 
 using namespace folly::compression;
 
diff --git a/folly/experimental/test/EventCountTest.cpp b/folly/experimental/test/EventCountTest.cpp
index ece8c0f6..077b4c71 100644
--- a/folly/experimental/test/EventCountTest.cpp
+++ b/folly/experimental/test/EventCountTest.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/EventCount.h"
+#include <folly/experimental/EventCount.h>
 
 #include <algorithm>
 #include <random>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/Random.h"
-#include "folly/Benchmark.h"
+#include <folly/Random.h>
+#include <folly/Benchmark.h>
 
 using namespace folly;
 
diff --git a/folly/experimental/test/TestUtilTest.cpp b/folly/experimental/test/TestUtilTest.cpp
index cfa56264..8e458532 100644
--- a/folly/experimental/test/TestUtilTest.cpp
+++ b/folly/experimental/test/TestUtilTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/experimental/TestUtil.h"
+#include <folly/experimental/TestUtil.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
diff --git a/folly/gen/Base.h b/folly/gen/Base.h
index 46141ee2..047de1e9 100644
--- a/folly/gen/Base.h
+++ b/folly/gen/Base.h
@@ -26,10 +26,10 @@
 #include <vector>
 #include <unordered_set>
 
-#include "folly/Range.h"
-#include "folly/Optional.h"
-#include "folly/Conv.h"
-#include "folly/gen/Core.h"
+#include <folly/Range.h>
+#include <folly/Optional.h>
+#include <folly/Conv.h>
+#include <folly/gen/Core.h>
 
 /**
  * Generator-based Sequence Comprehensions in C++, akin to C#'s LINQ
@@ -709,6 +709,6 @@ GuardImpl guard(ErrorHandler&& handler) {
 
 }} // folly::gen
 
-#include "folly/gen/Base-inl.h"
+#include <folly/gen/Base-inl.h>
 
 #endif // FOLLY_GEN_BASE_H
diff --git a/folly/gen/Combine.h b/folly/gen/Combine.h
index ff519c4d..d9d55736 100644
--- a/folly/gen/Combine.h
+++ b/folly/gen/Combine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Facebook, Inc.
+ * Copyright 2014 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #ifndef FOLLY_GEN_COMBINE_H
 #define FOLLY_GEN_COMBINE_H
 
-#include "folly/gen/Base.h"
+#include <folly/gen/Base.h>
 
 namespace folly {
 namespace gen {
@@ -40,6 +41,6 @@ Interleave interleave(Source2&& source2) {
 }  // namespace gen
 }  // namespace folly
 
-#include "folly/gen/Combine-inl.h"
+#include <folly/gen/Combine-inl.h>
 
 #endif // FOLLY_GEN_COMBINE_H
diff --git a/folly/gen/Core.h b/folly/gen/Core.h
index d470199c..62656639 100644
--- a/folly/gen/Core.h
+++ b/folly/gen/Core.h
@@ -40,6 +40,6 @@ class Chain;
 
 }} // folly::gen
 
-#include "folly/gen/Core-inl.h"
+#include <folly/gen/Core-inl.h>
 
 #endif // FOLLY_GEN_CORE_H
diff --git a/folly/gen/File-inl.h b/folly/gen/File-inl.h
index 268bd816..d077a147 100644
--- a/folly/gen/File-inl.h
+++ b/folly/gen/File-inl.h
@@ -20,7 +20,7 @@
 
 #include <system_error>
 
-#include "folly/gen/String.h"
+#include <folly/gen/String.h>
 
 namespace folly {
 namespace gen {
diff --git a/folly/gen/File.h b/folly/gen/File.h
index ded64c20..4b322746 100644
--- a/folly/gen/File.h
+++ b/folly/gen/File.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Facebook, Inc.
+ * Copyright 2014 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@
 #ifndef FOLLY_GEN_FILE_H
 #define FOLLY_GEN_FILE_H
 
-#include "folly/File.h"
-#include "folly/gen/Base.h"
-#include "folly/io/IOBuf.h"
+#include <folly/File.h>
+#include <folly/gen/Base.h>
+#include <folly/io/IOBuf.h>
 
 namespace folly {
 namespace gen {
@@ -67,6 +67,6 @@ S toFile(File file, std::unique_ptr<IOBuf> buffer) {
 
 }}  // !folly::gen
 
-#include "folly/gen/File-inl.h"
+#include <folly/gen/File-inl.h>
 
 #endif // FOLLY_GEN_FILE_H
diff --git a/folly/gen/Parallel-inl.h b/folly/gen/Parallel-inl.h
index b4866a11..ab37f7d8 100644
--- a/folly/gen/Parallel-inl.h
+++ b/folly/gen/Parallel-inl.h
@@ -18,9 +18,9 @@
 #error This file may only be included from folly/gen/ParallelGen.h
 #endif
 
-#include "folly/MPMCQueue.h"
-#include "folly/ScopeGuard.h"
-#include "folly/experimental/EventCount.h"
+#include <folly/MPMCQueue.h>
+#include <folly/ScopeGuard.h>
+#include <folly/experimental/EventCount.h>
 #include <atomic>
 #include <thread>
 #include <vector>
diff --git a/folly/gen/Parallel.h b/folly/gen/Parallel.h
index d1b99792..13540474 100644
--- a/folly/gen/Parallel.h
+++ b/folly/gen/Parallel.h
@@ -19,7 +19,7 @@
 
 #include <mutex>
 
-#include "folly/gen/Base.h"
+#include <folly/gen/Base.h>
 
 namespace folly { namespace gen {
 namespace detail {
@@ -105,6 +105,6 @@ Sub sub(Sink sink) {
 
 }} // !namespace folly::gen
 
-#include "folly/gen/Parallel-inl.h"
+#include <folly/gen/Parallel-inl.h>
 
 #endif /* FOLLY_GEN_PARALLEL_H_ */
diff --git a/folly/gen/ParallelMap-inl.h b/folly/gen/ParallelMap-inl.h
index 7cc0321b..d2f76612 100644
--- a/folly/gen/ParallelMap-inl.h
+++ b/folly/gen/ParallelMap-inl.h
@@ -25,8 +25,8 @@
 #include <utility>
 #include <vector>
 
-#include "folly/MPMCPipeline.h"
-#include "folly/experimental/EventCount.h"
+#include <folly/MPMCPipeline.h>
+#include <folly/experimental/EventCount.h>
 
 namespace folly { namespace gen { namespace detail {
 
diff --git a/folly/gen/ParallelMap.h b/folly/gen/ParallelMap.h
index 196dfd0b..07165782 100644
--- a/folly/gen/ParallelMap.h
+++ b/folly/gen/ParallelMap.h
@@ -17,7 +17,7 @@
 #ifndef FOLLY_GEN_PARALLELMAP_H
 #define FOLLY_GEN_PARALLELMAP_H
 
-#include "folly/gen/Core.h"
+#include <folly/gen/Core.h>
 
 namespace folly { namespace gen {
 
@@ -45,6 +45,6 @@ template<class Predicate,
 
 }}  // namespaces
 
-#include "folly/gen/ParallelMap-inl.h"
+#include <folly/gen/ParallelMap-inl.h>
 
 #endif  // FOLLY_GEN_PARALLELMAP_H
diff --git a/folly/gen/String-inl.h b/folly/gen/String-inl.h
index 651252f5..3f7b7c11 100644
--- a/folly/gen/String-inl.h
+++ b/folly/gen/String-inl.h
@@ -18,9 +18,9 @@
 #error This file may only be included from folly/gen/String.h
 #endif
 
-#include "folly/Conv.h"
-#include "folly/String.h"
-#include "folly/io/IOBuf.h"
+#include <folly/Conv.h>
+#include <folly/String.h>
+#include <folly/io/IOBuf.h>
 
 namespace folly {
 namespace gen {
diff --git a/folly/gen/String.h b/folly/gen/String.h
index 56aa774f..b6d56fb4 100644
--- a/folly/gen/String.h
+++ b/folly/gen/String.h
@@ -17,8 +17,8 @@
 #ifndef FOLLY_GEN_STRING_H
 #define FOLLY_GEN_STRING_H
 
-#include "folly/Range.h"
-#include "folly/gen/Base.h"
+#include <folly/Range.h>
+#include <folly/gen/Base.h>
 
 namespace folly {
 namespace gen {
@@ -171,6 +171,6 @@ eachToPair(StringPiece delim) {
 }  // namespace gen
 }  // namespace folly
 
-#include "folly/gen/String-inl.h"
+#include <folly/gen/String-inl.h>
 
 #endif // FOLLY_GEN_STRING_H
diff --git a/folly/gen/test/BaseBenchmark.cpp b/folly/gen/test/BaseBenchmark.cpp
index a7b095af..5ca1fbd9 100644
--- a/folly/gen/test/BaseBenchmark.cpp
+++ b/folly/gen/test/BaseBenchmark.cpp
@@ -16,8 +16,8 @@
 #include <atomic>
 #include <glog/logging.h>
 
-#include "folly/Benchmark.h"
-#include "folly/gen/Base.h"
+#include <folly/Benchmark.h>
+#include <folly/gen/Base.h>
 
 using namespace folly::gen;
 using folly::fbstring;
diff --git a/folly/gen/test/BaseTest.cpp b/folly/gen/test/BaseTest.cpp
index b7c71377..be056b5b 100644
--- a/folly/gen/test/BaseTest.cpp
+++ b/folly/gen/test/BaseTest.cpp
@@ -21,12 +21,12 @@
 #include <set>
 #include <vector>
 
-#include "folly/FBVector.h"
-#include "folly/MapUtil.h"
-#include "folly/Memory.h"
-#include "folly/dynamic.h"
-#include "folly/gen/Base.h"
-#include "folly/experimental/TestUtil.h"
+#include <folly/FBVector.h>
+#include <folly/MapUtil.h>
+#include <folly/Memory.h>
+#include <folly/dynamic.h>
+#include <folly/gen/Base.h>
+#include <folly/experimental/TestUtil.h>
 
 using namespace folly::gen;
 using namespace folly;
diff --git a/folly/gen/test/Bench.h b/folly/gen/test/Bench.h
index 31c00258..746553bd 100644
--- a/folly/gen/test/Bench.h
+++ b/folly/gen/test/Bench.h
@@ -17,7 +17,7 @@
 #ifndef FOLLY_GEN_BENCH_H_
 #define FOLLY_GEN_BENCH_H_
 
-#include "folly/Benchmark.h"
+#include <folly/Benchmark.h>
 
 #define BENCH_GEN_IMPL(gen, prefix)                         \
 static bool FB_ANONYMOUS_VARIABLE(benchGen) = (             \
diff --git a/folly/gen/test/CombineTest.cpp b/folly/gen/test/CombineTest.cpp
index 8f879888..ba231e57 100644
--- a/folly/gen/test/CombineTest.cpp
+++ b/folly/gen/test/CombineTest.cpp
@@ -18,11 +18,11 @@
 #include <vector>
 #include <tuple>
 
-#include "folly/Range.h"
-#include "folly/FBVector.h"
-#include "folly/experimental/TestUtil.h"
-#include "folly/gen/Base.h"
-#include "folly/gen/Combine.h"
+#include <folly/Range.h>
+#include <folly/FBVector.h>
+#include <folly/experimental/TestUtil.h>
+#include <folly/gen/Base.h>
+#include <folly/gen/Combine.h>
 
 using namespace folly::gen;
 using namespace folly;
diff --git a/folly/gen/test/FileBenchmark.cpp b/folly/gen/test/FileBenchmark.cpp
index 339fd293..0f4f5b4c 100644
--- a/folly/gen/test/FileBenchmark.cpp
+++ b/folly/gen/test/FileBenchmark.cpp
@@ -16,10 +16,10 @@
 #include <thread>
 #include <glog/logging.h>
 
-#include "folly/Benchmark.h"
-#include "folly/File.h"
-#include "folly/gen/Base.h"
-#include "folly/gen/File.h"
+#include <folly/Benchmark.h>
+#include <folly/File.h>
+#include <folly/gen/Base.h>
+#include <folly/gen/File.h>
 
 using namespace folly::gen;
 
diff --git a/folly/gen/test/FileTest.cpp b/folly/gen/test/FileTest.cpp
index fe9b3540..172c6f98 100644
--- a/folly/gen/test/FileTest.cpp
+++ b/folly/gen/test/FileTest.cpp
@@ -17,11 +17,11 @@
 #include <string>
 #include <vector>
 
-#include "folly/File.h"
-#include "folly/Range.h"
-#include "folly/experimental/TestUtil.h"
-#include "folly/gen/Base.h"
-#include "folly/gen/File.h"
+#include <folly/File.h>
+#include <folly/Range.h>
+#include <folly/experimental/TestUtil.h>
+#include <folly/gen/Base.h>
+#include <folly/gen/File.h>
 
 using namespace folly::gen;
 using namespace folly;
diff --git a/folly/gen/test/ParallelBenchmark.cpp b/folly/gen/test/ParallelBenchmark.cpp
index afebbc80..886eb4e7 100644
--- a/folly/gen/test/ParallelBenchmark.cpp
+++ b/folly/gen/test/ParallelBenchmark.cpp
@@ -20,9 +20,9 @@
 #include <vector>
 #include <future>
 
-#include "folly/gen/Base.h"
-#include "folly/gen/Parallel.h"
-#include "folly/gen/test/Bench.h"
+#include <folly/gen/Base.h>
+#include <folly/gen/Parallel.h>
+#include <folly/gen/test/Bench.h>
 
 
 DEFINE_int32(threads,
diff --git a/folly/gen/test/ParallelMapBenchmark.cpp b/folly/gen/test/ParallelMapBenchmark.cpp
index 1793b798..389269de 100644
--- a/folly/gen/test/ParallelMapBenchmark.cpp
+++ b/folly/gen/test/ParallelMapBenchmark.cpp
@@ -20,9 +20,9 @@
 #include <thread>
 #include <vector>
 
-#include "folly/Benchmark.h"
-#include "folly/gen/Base.h"
-#include "folly/gen/ParallelMap.h"
+#include <folly/Benchmark.h>
+#include <folly/gen/Base.h>
+#include <folly/gen/ParallelMap.h>
 
 using namespace folly::gen;
 
diff --git a/folly/gen/test/ParallelMapTest.cpp b/folly/gen/test/ParallelMapTest.cpp
index 7b29f6cd..15c0b454 100644
--- a/folly/gen/test/ParallelMapTest.cpp
+++ b/folly/gen/test/ParallelMapTest.cpp
@@ -19,9 +19,9 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/Memory.h"
-#include "folly/gen/Base.h"
-#include "folly/gen/ParallelMap.h"
+#include <folly/Memory.h>
+#include <folly/gen/Base.h>
+#include <folly/gen/ParallelMap.h>
 
 using namespace folly;
 using namespace folly::gen;
diff --git a/folly/gen/test/ParallelTest.cpp b/folly/gen/test/ParallelTest.cpp
index 7eabb317..585e325e 100644
--- a/folly/gen/test/ParallelTest.cpp
+++ b/folly/gen/test/ParallelTest.cpp
@@ -19,8 +19,8 @@
 #include <iostream>
 #include <array>
 #include <vector>
-#include "folly/gen/Base.h"
-#include "folly/gen/Parallel.h"
+#include <folly/gen/Base.h>
+#include <folly/gen/Parallel.h>
 
 using namespace folly;
 using namespace folly::gen;
diff --git a/folly/gen/test/StringBenchmark.cpp b/folly/gen/test/StringBenchmark.cpp
index 5c143ec4..7f2e2f0b 100644
--- a/folly/gen/test/StringBenchmark.cpp
+++ b/folly/gen/test/StringBenchmark.cpp
@@ -16,10 +16,10 @@
 #include <atomic>
 #include <glog/logging.h>
 
-#include "folly/Benchmark.h"
-#include "folly/String.h"
-#include "folly/gen/Base.h"
-#include "folly/gen/String.h"
+#include <folly/Benchmark.h>
+#include <folly/String.h>
+#include <folly/gen/Base.h>
+#include <folly/gen/String.h>
 
 using namespace folly;
 using namespace folly::gen;
diff --git a/folly/gen/test/StringTest.cpp b/folly/gen/test/StringTest.cpp
index 5a5a1888..71acab88 100644
--- a/folly/gen/test/StringTest.cpp
+++ b/folly/gen/test/StringTest.cpp
@@ -20,7 +20,7 @@
 #include <map>
 #include <vector>
 
-#include "folly/gen/String.h"
+#include <folly/gen/String.h>
 
 using namespace folly::gen;
 using namespace folly;
diff --git a/folly/io/Compression.cpp b/folly/io/Compression.cpp
index 02b54a42..563b878a 100644
--- a/folly/io/Compression.cpp
+++ b/folly/io/Compression.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/io/Compression.h"
+#include <folly/io/Compression.h>
 
 #if FOLLY_HAVE_LIBLZ4
 #include <lz4.h>
@@ -36,12 +36,12 @@
 #include <lzma.h>
 #endif
 
-#include "folly/Conv.h"
-#include "folly/Memory.h"
-#include "folly/Portability.h"
-#include "folly/ScopeGuard.h"
-#include "folly/Varint.h"
-#include "folly/io/Cursor.h"
+#include <folly/Conv.h>
+#include <folly/Memory.h>
+#include <folly/Portability.h>
+#include <folly/ScopeGuard.h>
+#include <folly/Varint.h>
+#include <folly/io/Cursor.h>
 
 namespace folly { namespace io {
 
diff --git a/folly/io/Compression.h b/folly/io/Compression.h
index fd680794..569356b1 100644
--- a/folly/io/Compression.h
+++ b/folly/io/Compression.h
@@ -21,7 +21,7 @@
 #include <limits>
 #include <memory>
 
-#include "folly/io/IOBuf.h"
+#include <folly/io/IOBuf.h>
 
 /**
  * Compression / decompression over IOBufs
diff --git a/folly/io/Cursor.h b/folly/io/Cursor.h
index 2e90d081..59fa0440 100644
--- a/folly/io/Cursor.h
+++ b/folly/io/Cursor.h
@@ -23,11 +23,11 @@
 #include <type_traits>
 #include <memory>
 
-#include "folly/Bits.h"
-#include "folly/io/IOBuf.h"
-#include "folly/io/IOBufQueue.h"
-#include "folly/Likely.h"
-#include "folly/Memory.h"
+#include <folly/Bits.h>
+#include <folly/io/IOBuf.h>
+#include <folly/io/IOBufQueue.h>
+#include <folly/Likely.h>
+#include <folly/Memory.h>
 
 /**
  * Cursor class for fast iteration over IOBuf chains.
diff --git a/folly/io/IOBuf.cpp b/folly/io/IOBuf.cpp
index b369eedf..c0410c83 100644
--- a/folly/io/IOBuf.cpp
+++ b/folly/io/IOBuf.cpp
@@ -16,15 +16,15 @@
 
 #define __STDC_LIMIT_MACROS
 
-#include "folly/io/IOBuf.h"
-
-#include "folly/Conv.h"
-#include "folly/Likely.h"
-#include "folly/Malloc.h"
-#include "folly/Memory.h"
-#include "folly/ScopeGuard.h"
-#include "folly/SpookyHashV2.h"
-#include "folly/io/Cursor.h"
+#include <folly/io/IOBuf.h>
+
+#include <folly/Conv.h>
+#include <folly/Likely.h>
+#include <folly/Malloc.h>
+#include <folly/Memory.h>
+#include <folly/ScopeGuard.h>
+#include <folly/SpookyHashV2.h>
+#include <folly/io/Cursor.h>
 
 #include <stdexcept>
 #include <assert.h>
diff --git a/folly/io/IOBuf.h b/folly/io/IOBuf.h
index 2895c0d5..dccd57b0 100644
--- a/folly/io/IOBuf.h
+++ b/folly/io/IOBuf.h
@@ -30,9 +30,9 @@
 
 #include <boost/iterator/iterator_facade.hpp>
 
-#include "folly/FBString.h"
-#include "folly/Range.h"
-#include "folly/FBVector.h"
+#include <folly/FBString.h>
+#include <folly/Range.h>
+#include <folly/FBVector.h>
 
 // Ignore shadowing warnings within this file, so includers can use -Wshadow.
 #pragma GCC diagnostic push
diff --git a/folly/io/IOBufQueue.cpp b/folly/io/IOBufQueue.cpp
index 58c1844a..8f40d079 100644
--- a/folly/io/IOBufQueue.cpp
+++ b/folly/io/IOBufQueue.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/io/IOBufQueue.h"
+#include <folly/io/IOBufQueue.h>
 
 #include <string.h>
 
diff --git a/folly/io/IOBufQueue.h b/folly/io/IOBufQueue.h
index 8ec60611..59fdc940 100644
--- a/folly/io/IOBufQueue.h
+++ b/folly/io/IOBufQueue.h
@@ -17,7 +17,7 @@
 #ifndef FOLLY_IO_IOBUF_QUEUE_H
 #define FOLLY_IO_IOBUF_QUEUE_H
 
-#include "folly/io/IOBuf.h"
+#include <folly/io/IOBuf.h>
 
 #include <stdexcept>
 #include <string>
diff --git a/folly/io/RecordIO-inl.h b/folly/io/RecordIO-inl.h
index 609443f6..8587ac69 100644
--- a/folly/io/RecordIO-inl.h
+++ b/folly/io/RecordIO-inl.h
@@ -20,7 +20,7 @@
 
 #include <boost/iterator/iterator_facade.hpp>
 
-#include "folly/SpookyHashV2.h"
+#include <folly/SpookyHashV2.h>
 
 namespace folly {
 
diff --git a/folly/io/RecordIO.cpp b/folly/io/RecordIO.cpp
index 1dc245a1..6aab5321 100644
--- a/folly/io/RecordIO.cpp
+++ b/folly/io/RecordIO.cpp
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-#include "folly/io/RecordIO.h"
+#include <folly/io/RecordIO.h>
 
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "folly/Exception.h"
-#include "folly/FileUtil.h"
-#include "folly/Memory.h"
-#include "folly/Portability.h"
-#include "folly/ScopeGuard.h"
-#include "folly/String.h"
+#include <folly/Exception.h>
+#include <folly/FileUtil.h>
+#include <folly/Memory.h>
+#include <folly/Portability.h>
+#include <folly/ScopeGuard.h>
+#include <folly/String.h>
 
 namespace folly {
 
diff --git a/folly/io/RecordIO.h b/folly/io/RecordIO.h
index 1f142e26..fe19f4ca 100644
--- a/folly/io/RecordIO.h
+++ b/folly/io/RecordIO.h
@@ -29,10 +29,10 @@
 #include <memory>
 #include <mutex>
 
-#include "folly/File.h"
-#include "folly/Range.h"
-#include "folly/MemoryMapping.h"
-#include "folly/io/IOBuf.h"
+#include <folly/File.h>
+#include <folly/Range.h>
+#include <folly/MemoryMapping.h>
+#include <folly/io/IOBuf.h>
 
 namespace folly {
 
@@ -175,7 +175,7 @@ RecordInfo validateRecord(ByteRange range, uint32_t fileId);
 
 }  // namespaces
 
-#include "folly/io/RecordIO-inl.h"
+#include <folly/io/RecordIO-inl.h>
 
 #endif /* FOLLY_IO_RECORDIO_H_ */
 
diff --git a/folly/io/TypedIOBuf.h b/folly/io/TypedIOBuf.h
index c5ecfc48..6296a95d 100644
--- a/folly/io/TypedIOBuf.h
+++ b/folly/io/TypedIOBuf.h
@@ -21,8 +21,8 @@
 #include <iterator>
 #include <type_traits>
 
-#include "folly/Malloc.h"
-#include "folly/io/IOBuf.h"
+#include <folly/Malloc.h>
+#include <folly/io/IOBuf.h>
 
 namespace folly {
 
diff --git a/folly/io/async/AsyncTimeout.cpp b/folly/io/async/AsyncTimeout.cpp
index c2196dd1..4119e35b 100644
--- a/folly/io/async/AsyncTimeout.cpp
+++ b/folly/io/async/AsyncTimeout.cpp
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-#include "folly/io/async/AsyncTimeout.h"
-#include "folly/io/async/EventBase.h"
-#include "folly/io/async/EventUtil.h"
-#include "folly/io/async/Request.h"
+#include <folly/io/async/AsyncTimeout.h>
+#include <folly/io/async/EventBase.h>
+#include <folly/io/async/EventUtil.h>
+#include <folly/io/async/Request.h>
 
 #include <assert.h>
 #include <glog/logging.h>
diff --git a/folly/io/async/AsyncTimeout.h b/folly/io/async/AsyncTimeout.h
index d1d2ba87..bf1947d0 100644
--- a/folly/io/async/AsyncTimeout.h
+++ b/folly/io/async/AsyncTimeout.h
@@ -18,7 +18,7 @@
  */
 #pragma once
 
-#include "folly/io/async/TimeoutManager.h"
+#include <folly/io/async/TimeoutManager.h>
 
 #include <boost/noncopyable.hpp>
 #include <event.h>
diff --git a/folly/io/async/EventBase.cpp b/folly/io/async/EventBase.cpp
index b548d177..9415e05a 100644
--- a/folly/io/async/EventBase.cpp
+++ b/folly/io/async/EventBase.cpp
@@ -18,10 +18,10 @@
 #define __STDC_FORMAT_MACROS
 #endif
 
-#include "folly/io/async/EventBase.h"
+#include <folly/io/async/EventBase.h>
 
-#include "folly/ThreadName.h"
-#include "folly/io/async/NotificationQueue.h"
+#include <folly/ThreadName.h>
+#include <folly/io/async/NotificationQueue.h>
 
 #include <boost/static_assert.hpp>
 #include <fcntl.h>
diff --git a/folly/io/async/EventBase.h b/folly/io/async/EventBase.h
index c1fd81c2..c6223077 100644
--- a/folly/io/async/EventBase.h
+++ b/folly/io/async/EventBase.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <glog/logging.h>
-#include "folly/io/async/AsyncTimeout.h"
-#include "folly/io/async/TimeoutManager.h"
+#include <folly/io/async/AsyncTimeout.h>
+#include <folly/io/async/TimeoutManager.h>
 #include <memory>
 #include <stack>
 #include <list>
diff --git a/folly/io/async/EventHandler.cpp b/folly/io/async/EventHandler.cpp
index 6d410de6..77b09d14 100644
--- a/folly/io/async/EventHandler.cpp
+++ b/folly/io/async/EventHandler.cpp
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-#include "folly/io/async/EventHandler.h"
-#include "folly/io/async/EventBase.h"
+#include <folly/io/async/EventHandler.h>
+#include <folly/io/async/EventBase.h>
 
 #include <assert.h>
 
diff --git a/folly/io/async/EventHandler.h b/folly/io/async/EventHandler.h
index 520a24c7..31abc7ee 100644
--- a/folly/io/async/EventHandler.h
+++ b/folly/io/async/EventHandler.h
@@ -19,7 +19,7 @@
 #pragma once
 
 #include <glog/logging.h>
-#include "folly/io/async/EventUtil.h"
+#include <folly/io/async/EventUtil.h>
 #include <boost/noncopyable.hpp>
 #include <stddef.h>
 
diff --git a/folly/io/async/NotificationQueue.h b/folly/io/async/NotificationQueue.h
index d4996a07..622e8551 100644
--- a/folly/io/async/NotificationQueue.h
+++ b/folly/io/async/NotificationQueue.h
@@ -21,13 +21,13 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "folly/io/async/EventBase.h"
-#include "folly/io/async/EventFDWrapper.h"
-#include "folly/io/async/EventHandler.h"
-#include "folly/io/async/Request.h"
-#include "folly/Likely.h"
-#include "folly/SmallLocks.h"
-#include "folly/ScopeGuard.h"
+#include <folly/io/async/EventBase.h>
+#include <folly/io/async/EventFDWrapper.h>
+#include <folly/io/async/EventHandler.h>
+#include <folly/io/async/Request.h>
+#include <folly/Likely.h>
+#include <folly/SmallLocks.h>
+#include <folly/ScopeGuard.h>
 
 #include <glog/logging.h>
 #include <deque>
diff --git a/folly/io/async/Request.cpp b/folly/io/async/Request.cpp
index 28360b50..3ea9fd5a 100644
--- a/folly/io/async/Request.cpp
+++ b/folly/io/async/Request.cpp
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-#include "folly/io/async/Request.h"
+#include <folly/io/async/Request.h>
 
 #ifndef NO_LIB_GFLAGS
   DEFINE_bool(enable_request_context, true,
diff --git a/folly/io/async/Request.h b/folly/io/async/Request.h
index d1e853c2..85459fb4 100644
--- a/folly/io/async/Request.h
+++ b/folly/io/async/Request.h
@@ -21,8 +21,8 @@
 #include <map>
 #include <memory>
 #include <glog/logging.h>
-#include "folly/ThreadLocal.h"
-#include "folly/RWSpinLock.h"
+#include <folly/ThreadLocal.h>
+#include <folly/RWSpinLock.h>
 
 /**
  * In many cases this header is included as a
diff --git a/folly/io/test/CompressionTest.cpp b/folly/io/test/CompressionTest.cpp
index eabd3993..4968f07e 100644
--- a/folly/io/test/CompressionTest.cpp
+++ b/folly/io/test/CompressionTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/io/Compression.h"
+#include <folly/io/Compression.h>
 
 // Yes, tr1, as that's what gtest requires
 #include <random>
@@ -26,10 +26,10 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/Benchmark.h"
-#include "folly/Hash.h"
-#include "folly/Random.h"
-#include "folly/io/IOBufQueue.h"
+#include <folly/Benchmark.h>
+#include <folly/Hash.h>
+#include <folly/Random.h>
+#include <folly/io/IOBufQueue.h>
 
 namespace folly { namespace io { namespace test {
 
diff --git a/folly/io/test/IOBufCursorTest.cpp b/folly/io/test/IOBufCursorTest.cpp
index 081945a0..824df93e 100644
--- a/folly/io/test/IOBufCursorTest.cpp
+++ b/folly/io/test/IOBufCursorTest.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "folly/io/IOBuf.h"
+#include <folly/io/IOBuf.h>
 
 #include <gflags/gflags.h>
 #include <boost/random.hpp>
 #include <gtest/gtest.h>
-#include "folly/Benchmark.h"
-#include "folly/Range.h"
-#include "folly/io/Cursor.h"
+#include <folly/Benchmark.h>
+#include <folly/Range.h>
+#include <folly/io/Cursor.h>
 
 DECLARE_bool(benchmark);
 
diff --git a/folly/io/test/IOBufQueueTest.cpp b/folly/io/test/IOBufQueueTest.cpp
index 0b95986b..8e905171 100644
--- a/folly/io/test/IOBufQueueTest.cpp
+++ b/folly/io/test/IOBufQueueTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/io/IOBufQueue.h"
-#include "folly/Range.h"
+#include <folly/io/IOBufQueue.h>
+#include <folly/Range.h>
 
 #include <gflags/gflags.h>
 #include <gtest/gtest.h>
diff --git a/folly/io/test/IOBufTest.cpp b/folly/io/test/IOBufTest.cpp
index 0a1a17c6..283bee7d 100644
--- a/folly/io/test/IOBufTest.cpp
+++ b/folly/io/test/IOBufTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/io/IOBuf.h"
-#include "folly/io/TypedIOBuf.h"
+#include <folly/io/IOBuf.h>
+#include <folly/io/TypedIOBuf.h>
 
 // googletest requires std::tr1::tuple, not std::tuple
 #include <tr1/tuple>
@@ -24,8 +24,8 @@
 #include <boost/random.hpp>
 #include <gtest/gtest.h>
 
-#include "folly/Malloc.h"
-#include "folly/Range.h"
+#include <folly/Malloc.h>
+#include <folly/Range.h>
 
 using folly::fbstring;
 using folly::fbvector;
diff --git a/folly/io/test/NetworkBenchmark.cpp b/folly/io/test/NetworkBenchmark.cpp
index e320735b..45077342 100644
--- a/folly/io/test/NetworkBenchmark.cpp
+++ b/folly/io/test/NetworkBenchmark.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "folly/io/IOBuf.h"
+#include <folly/io/IOBuf.h>
 
 #include <gflags/gflags.h>
-#include "folly/Benchmark.h"
-#include "folly/io/Cursor.h"
+#include <folly/Benchmark.h>
+#include <folly/io/Cursor.h>
 
 #include <vector>
 
diff --git a/folly/io/test/RecordIOTest.cpp b/folly/io/test/RecordIOTest.cpp
index 2ffbb976..f4d20bad 100644
--- a/folly/io/test/RecordIOTest.cpp
+++ b/folly/io/test/RecordIOTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/io/RecordIO.h"
+#include <folly/io/RecordIO.h>
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -25,11 +25,11 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/Conv.h"
-#include "folly/FBString.h"
-#include "folly/Random.h"
-#include "folly/experimental/TestUtil.h"
-#include "folly/io/IOBufQueue.h"
+#include <folly/Conv.h>
+#include <folly/FBString.h>
+#include <folly/Random.h>
+#include <folly/experimental/TestUtil.h>
+#include <folly/io/IOBufQueue.h>
 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");
 
diff --git a/folly/json.cpp b/folly/json.cpp
index 5ca57d47..f6bf8f2c 100644
--- a/folly/json.cpp
+++ b/folly/json.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "folly/json.h"
+#include <folly/json.h>
 #include <cassert>
 #include <boost/next_prior.hpp>
 #include <boost/algorithm/string.hpp>
 
-#include "folly/Range.h"
-#include "folly/Unicode.h"
-#include "folly/Conv.h"
+#include <folly/Range.h>
+#include <folly/Unicode.h>
+#include <folly/Conv.h>
 
 namespace folly {
 
diff --git a/folly/json.h b/folly/json.h
index 3704829d..89d3b068 100644
--- a/folly/json.h
+++ b/folly/json.h
@@ -41,9 +41,9 @@
 #ifndef FOLLY_JSON_H_
 #define FOLLY_JSON_H_
 
-#include "folly/dynamic.h"
-#include "folly/FBString.h"
-#include "folly/Range.h"
+#include <folly/dynamic.h>
+#include <folly/FBString.h>
+#include <folly/Range.h>
 
 namespace folly {
 
diff --git a/folly/small_vector.h b/folly/small_vector.h
index f5eddcb3..1a8c542b 100644
--- a/folly/small_vector.h
+++ b/folly/small_vector.h
@@ -46,7 +46,7 @@
 #include <boost/mpl/count.hpp>
 #include <boost/mpl/max.hpp>
 
-#include "folly/Malloc.h"
+#include <folly/Malloc.h>
 
 #if defined(__GNUC__) && FOLLY_X64
 # include "folly/SmallLocks.h"
diff --git a/folly/stats/BucketedTimeSeries-defs.h b/folly/stats/BucketedTimeSeries-defs.h
index d37539a7..c2ada607 100644
--- a/folly/stats/BucketedTimeSeries-defs.h
+++ b/folly/stats/BucketedTimeSeries-defs.h
@@ -18,7 +18,7 @@
 #define FOLLY_STATS_BUCKETEDTIMESERIES_INL_H_
 
 #include <glog/logging.h>
-#include "folly/Likely.h"
+#include <folly/Likely.h>
 
 namespace folly {
 
diff --git a/folly/stats/BucketedTimeSeries.h b/folly/stats/BucketedTimeSeries.h
index 8336c7d9..912e719f 100644
--- a/folly/stats/BucketedTimeSeries.h
+++ b/folly/stats/BucketedTimeSeries.h
@@ -20,7 +20,7 @@
 #include <chrono>
 #include <vector>
 
-#include "folly/detail/Stats.h"
+#include <folly/detail/Stats.h>
 
 namespace folly {
 
diff --git a/folly/stats/Histogram-defs.h b/folly/stats/Histogram-defs.h
index bb302789..dbdea660 100644
--- a/folly/stats/Histogram-defs.h
+++ b/folly/stats/Histogram-defs.h
@@ -17,7 +17,7 @@
 #ifndef FOLLY_HISTOGRAM_DEFS_H_
 #define FOLLY_HISTOGRAM_DEFS_H_
 
-#include "folly/Conv.h"
+#include <folly/Conv.h>
 
 #include <glog/logging.h>
 
diff --git a/folly/stats/Histogram.h b/folly/stats/Histogram.h
index 55c5c7b2..cf49be7c 100644
--- a/folly/stats/Histogram.h
+++ b/folly/stats/Histogram.h
@@ -24,7 +24,7 @@
 #include <vector>
 #include <stdexcept>
 
-#include "folly/detail/Stats.h"
+#include <folly/detail/Stats.h>
 
 namespace folly {
 
diff --git a/folly/stats/Instantiations.cpp b/folly/stats/Instantiations.cpp
index 8739d55f..2b6f926d 100644
--- a/folly/stats/Instantiations.cpp
+++ b/folly/stats/Instantiations.cpp
@@ -21,17 +21,17 @@
  * header files.
  */
 
-#include "folly/stats/BucketedTimeSeries.h"
-#include "folly/stats/BucketedTimeSeries-defs.h"
+#include <folly/stats/BucketedTimeSeries.h>
+#include <folly/stats/BucketedTimeSeries-defs.h>
 
-#include "folly/stats/Histogram.h"
-#include "folly/stats/Histogram-defs.h"
+#include <folly/stats/Histogram.h>
+#include <folly/stats/Histogram-defs.h>
 
-#include "folly/stats/MultiLevelTimeSeries.h"
-#include "folly/stats/MultiLevelTimeSeries-defs.h"
+#include <folly/stats/MultiLevelTimeSeries.h>
+#include <folly/stats/MultiLevelTimeSeries-defs.h>
 
-#include "folly/stats/TimeseriesHistogram.h"
-#include "folly/stats/TimeseriesHistogram-defs.h"
+#include <folly/stats/TimeseriesHistogram.h>
+#include <folly/stats/TimeseriesHistogram-defs.h>
 
 namespace folly {
 
diff --git a/folly/stats/MultiLevelTimeSeries.h b/folly/stats/MultiLevelTimeSeries.h
index 234622d3..7a81046e 100644
--- a/folly/stats/MultiLevelTimeSeries.h
+++ b/folly/stats/MultiLevelTimeSeries.h
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include <glog/logging.h>
-#include "folly/stats/BucketedTimeSeries.h"
+#include <folly/stats/BucketedTimeSeries.h>
 
 namespace folly {
 
diff --git a/folly/stats/TimeseriesHistogram-defs.h b/folly/stats/TimeseriesHistogram-defs.h
index fa07e798..2ee4b060 100644
--- a/folly/stats/TimeseriesHistogram-defs.h
+++ b/folly/stats/TimeseriesHistogram-defs.h
@@ -17,10 +17,10 @@
 #ifndef FOLLY_TIMESERIES_HISTOGRAM_DEF_H_
 #define FOLLY_TIMESERIES_HISTOGRAM_DEF_H_
 
-#include "folly/Conv.h"
-#include "folly/stats/Histogram-defs.h"
-#include "folly/stats/MultiLevelTimeSeries-defs.h"
-#include "folly/stats/BucketedTimeSeries-defs.h"
+#include <folly/Conv.h>
+#include <folly/stats/Histogram-defs.h>
+#include <folly/stats/MultiLevelTimeSeries-defs.h>
+#include <folly/stats/BucketedTimeSeries-defs.h>
 
 namespace folly {
 
diff --git a/folly/stats/TimeseriesHistogram.h b/folly/stats/TimeseriesHistogram.h
index 834c7597..7f4bc084 100644
--- a/folly/stats/TimeseriesHistogram.h
+++ b/folly/stats/TimeseriesHistogram.h
@@ -19,8 +19,8 @@
 
 #include <string>
 #include <boost/static_assert.hpp>
-#include "folly/stats/Histogram.h"
-#include "folly/stats/MultiLevelTimeSeries.h"
+#include <folly/stats/Histogram.h>
+#include <folly/stats/MultiLevelTimeSeries.h>
 
 namespace folly {
 
diff --git a/folly/test/AHMIntStressTest.cpp b/folly/test/AHMIntStressTest.cpp
index 32c2912f..fdc4559c 100644
--- a/folly/test/AHMIntStressTest.cpp
+++ b/folly/test/AHMIntStressTest.cpp
@@ -20,9 +20,9 @@
 #include <memory>
 #include <mutex>
 
-#include "folly/AtomicHashMap.h"
-#include "folly/ScopeGuard.h"
-#include "folly/Memory.h"
+#include <folly/AtomicHashMap.h>
+#include <folly/ScopeGuard.h>
+#include <folly/Memory.h>
 
 namespace {
 
diff --git a/folly/test/ApplyTupleTest.cpp b/folly/test/ApplyTupleTest.cpp
index 7ddac05f..bf82a9cd 100644
--- a/folly/test/ApplyTupleTest.cpp
+++ b/folly/test/ApplyTupleTest.cpp
@@ -16,7 +16,7 @@
 
 #include <iostream>
 
-#include "folly/ApplyTuple.h"
+#include <folly/ApplyTuple.h>
 #include <gtest/gtest.h>
 
 #include <memory>
diff --git a/folly/test/ArenaSmartPtrTest.cpp b/folly/test/ArenaSmartPtrTest.cpp
index 07cd9bd7..e2a06122 100644
--- a/folly/test/ArenaSmartPtrTest.cpp
+++ b/folly/test/ArenaSmartPtrTest.cpp
@@ -18,8 +18,8 @@
  * @author: Marcelo Juchem <marcelo@fb.com>
  */
 
-#include "folly/Memory.h"
-#include "folly/Arena.h"
+#include <folly/Memory.h>
+#include <folly/Arena.h>
 
 #include <gtest/gtest.h>
 
diff --git a/folly/test/ArenaTest.cpp b/folly/test/ArenaTest.cpp
index f54c0892..feda95ca 100644
--- a/folly/test/ArenaTest.cpp
+++ b/folly/test/ArenaTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/Arena.h"
-#include "folly/Memory.h"
+#include <folly/Arena.h>
+#include <folly/Memory.h>
 
 #include <set>
 #include <vector>
diff --git a/folly/test/AsciiCaseInsensitiveBenchmark.cpp b/folly/test/AsciiCaseInsensitiveBenchmark.cpp
index 89c92b75..610dba67 100644
--- a/folly/test/AsciiCaseInsensitiveBenchmark.cpp
+++ b/folly/test/AsciiCaseInsensitiveBenchmark.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/Benchmark.h"
-#include "folly/Range.h"
+#include <folly/Benchmark.h>
+#include <folly/Range.h>
 
 #include <algorithm>
 
diff --git a/folly/test/AsciiCaseInsensitiveTest.cpp b/folly/test/AsciiCaseInsensitiveTest.cpp
index 2a357b0b..373998c4 100644
--- a/folly/test/AsciiCaseInsensitiveTest.cpp
+++ b/folly/test/AsciiCaseInsensitiveTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Range.h"
+#include <folly/Range.h>
 
 #include <gtest/gtest.h>
 #include <algorithm>
diff --git a/folly/test/AtomicBitSetTest.cpp b/folly/test/AtomicBitSetTest.cpp
index 5c939bad..11032acd 100644
--- a/folly/test/AtomicBitSetTest.cpp
+++ b/folly/test/AtomicBitSetTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/AtomicBitSet.h"
+#include <folly/AtomicBitSet.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
diff --git a/folly/test/AtomicHashArrayTest.cpp b/folly/test/AtomicHashArrayTest.cpp
index 6079b060..ad324874 100644
--- a/folly/test/AtomicHashArrayTest.cpp
+++ b/folly/test/AtomicHashArrayTest.cpp
@@ -20,10 +20,10 @@
 #include <map>
 #include <stdexcept>
 
-#include "folly/AtomicHashArray.h"
-#include "folly/Hash.h"
-#include "folly/Conv.h"
-#include "folly/Memory.h"
+#include <folly/AtomicHashArray.h>
+#include <folly/Hash.h>
+#include <folly/Conv.h>
+#include <folly/Memory.h>
 #include <gtest/gtest.h>
 
 #if !defined(MAP_ANONYMOUS) && defined(MAP_ANON)
diff --git a/folly/test/AtomicHashMapTest.cpp b/folly/test/AtomicHashMapTest.cpp
index 4736f6aa..449b5622 100644
--- a/folly/test/AtomicHashMapTest.cpp
+++ b/folly/test/AtomicHashMapTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/AtomicHashMap.h"
+#include <folly/AtomicHashMap.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
@@ -22,8 +22,8 @@
 #include <thread>
 #include <atomic>
 #include <memory>
-#include "folly/Benchmark.h"
-#include "folly/Conv.h"
+#include <folly/Benchmark.h>
+#include <folly/Conv.h>
 
 using std::vector;
 using std::string;
diff --git a/folly/test/AtomicStructTest.cpp b/folly/test/AtomicStructTest.cpp
index 9e7d68b6..e142834c 100644
--- a/folly/test/AtomicStructTest.cpp
+++ b/folly/test/AtomicStructTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/AtomicStruct.h"
+#include <folly/AtomicStruct.h>
 
 #include <gflags/gflags.h>
 #include <gtest/gtest.h>
diff --git a/folly/test/BenchmarkTest.cpp b/folly/test/BenchmarkTest.cpp
index 317df615..a039f02d 100644
--- a/folly/test/BenchmarkTest.cpp
+++ b/folly/test/BenchmarkTest.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "folly/Benchmark.h"
-#include "folly/Foreach.h"
-#include "folly/String.h"
+#include <folly/Benchmark.h>
+#include <folly/Foreach.h>
+#include <folly/String.h>
 #include <iostream>
 using namespace folly;
 using namespace std;
diff --git a/folly/test/BitIteratorTest.cpp b/folly/test/BitIteratorTest.cpp
index 965d9069..478cd6a8 100644
--- a/folly/test/BitIteratorTest.cpp
+++ b/folly/test/BitIteratorTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/Bits.h"
-#include "folly/Benchmark.h"
+#include <folly/Bits.h>
+#include <folly/Benchmark.h>
 
 #include <algorithm>
 #include <type_traits>
diff --git a/folly/test/BitsTest.cpp b/folly/test/BitsTest.cpp
index 4e504e0d..ba47aaf5 100644
--- a/folly/test/BitsTest.cpp
+++ b/folly/test/BitsTest.cpp
@@ -17,8 +17,8 @@
 // @author Tudor Bosman (tudorb@fb.com)
 
 #include <gflags/gflags.h>
-#include "folly/Bits.h"
-#include "folly/Benchmark.h"
+#include <folly/Bits.h>
+#include <folly/Benchmark.h>
 #include <gtest/gtest.h>
 
 using namespace folly;
diff --git a/folly/test/CacheLocalityTest.cpp b/folly/test/CacheLocalityTest.cpp
index 338c9c47..0b5322fe 100644
--- a/folly/test/CacheLocalityTest.cpp
+++ b/folly/test/CacheLocalityTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/detail/CacheLocality.h"
+#include <folly/detail/CacheLocality.h>
 
 #include <sched.h>
 #include <memory>
@@ -23,7 +23,7 @@
 #include <unordered_map>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
-#include "folly/Benchmark.h"
+#include <folly/Benchmark.h>
 
 using namespace folly::detail;
 
diff --git a/folly/test/ChecksumTest.cpp b/folly/test/ChecksumTest.cpp
index 94679b76..e563d3f9 100644
--- a/folly/test/ChecksumTest.cpp
+++ b/folly/test/ChecksumTest.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "folly/Checksum.h"
+#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/Benchmark.h>
+#include <folly/Hash.h>
+#include <folly/detail/ChecksumDetail.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 362b384d..2fe52579 100644
--- a/folly/test/ConcurrentSkipListBenchmark.cpp
+++ b/folly/test/ConcurrentSkipListBenchmark.cpp
@@ -22,10 +22,10 @@
 
 #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/Benchmark.h>
+#include <folly/ConcurrentSkipList.h>
+#include <folly/Hash.h>
+#include <folly/RWSpinLock.h>
 
 
 DEFINE_int32(num_threads, 12, "num concurrent threads to test");
diff --git a/folly/test/ConcurrentSkipListTest.cpp b/folly/test/ConcurrentSkipListTest.cpp
index f3c9c972..02ce733b 100644
--- a/folly/test/ConcurrentSkipListTest.cpp
+++ b/folly/test/ConcurrentSkipListTest.cpp
@@ -24,9 +24,9 @@
 
 #include <glog/logging.h>
 #include <gflags/gflags.h>
-#include "folly/ConcurrentSkipList.h"
-#include "folly/Foreach.h"
-#include "folly/String.h"
+#include <folly/ConcurrentSkipList.h>
+#include <folly/Foreach.h>
+#include <folly/String.h>
 #include <gtest/gtest.h>
 
 DEFINE_int32(num_threads, 12, "num concurrent threads to test");
diff --git a/folly/test/ConvTest.cpp b/folly/test/ConvTest.cpp
index 1b6214db..f692af7b 100644
--- a/folly/test/ConvTest.cpp
+++ b/folly/test/ConvTest.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "folly/Benchmark.h"
-#include "folly/Conv.h"
-#include "folly/Foreach.h"
+#include <folly/Benchmark.h>
+#include <folly/Conv.h>
+#include <folly/Foreach.h>
 #include <boost/lexical_cast.hpp>
 #include <gtest/gtest.h>
 #include <limits>
diff --git a/folly/test/CpuIdTest.cpp b/folly/test/CpuIdTest.cpp
index 83892cc0..ed6bcd1e 100644
--- a/folly/test/CpuIdTest.cpp
+++ b/folly/test/CpuIdTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/CpuId.h"
+#include <folly/CpuId.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
diff --git a/folly/test/DiscriminatedPtrTest.cpp b/folly/test/DiscriminatedPtrTest.cpp
index e282d9d3..10a5a70f 100644
--- a/folly/test/DiscriminatedPtrTest.cpp
+++ b/folly/test/DiscriminatedPtrTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/DiscriminatedPtr.h"
+#include <folly/DiscriminatedPtr.h>
 
 #include <gtest/gtest.h>
 
diff --git a/folly/test/DynamicConverterTest.cpp b/folly/test/DynamicConverterTest.cpp
index 4a8648aa..5237cb6c 100644
--- a/folly/test/DynamicConverterTest.cpp
+++ b/folly/test/DynamicConverterTest.cpp
@@ -16,7 +16,7 @@
 
 // @author Nicholas Ormrod <njormrod@fb.com>
 
-#include "folly/DynamicConverter.h"
+#include <folly/DynamicConverter.h>
 
 #include <algorithm>
 #include <gflags/gflags.h>
@@ -24,7 +24,7 @@
 #include <map>
 #include <vector>
 
-#include "folly/Benchmark.h"
+#include <folly/Benchmark.h>
 
 using namespace folly;
 using namespace folly::dynamicconverter_detail;
diff --git a/folly/test/DynamicTest.cpp b/folly/test/DynamicTest.cpp
index 18dcbcf5..1e3e25cc 100644
--- a/folly/test/DynamicTest.cpp
+++ b/folly/test/DynamicTest.cpp
@@ -18,10 +18,10 @@
 #include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
-#include "folly/Benchmark.h"
-#include "folly/dynamic.h"
-#include "folly/gen/Base.h"
-#include "folly/json.h"
+#include <folly/Benchmark.h>
+#include <folly/dynamic.h>
+#include <folly/gen/Base.h>
+#include <folly/json.h>
 
 using folly::dynamic;
 
diff --git a/folly/test/EndianTest.cpp b/folly/test/EndianTest.cpp
index 76274ce6..62ec78d2 100644
--- a/folly/test/EndianTest.cpp
+++ b/folly/test/EndianTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Bits.h"
+#include <folly/Bits.h>
 
 #include <gtest/gtest.h>
 
diff --git a/folly/test/ExceptionTest.cpp b/folly/test/ExceptionTest.cpp
index dd0f8b13..690a2b18 100644
--- a/folly/test/ExceptionTest.cpp
+++ b/folly/test/ExceptionTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Exception.h"
+#include <folly/Exception.h>
 
 #include <cstdio>
 #include <memory>
diff --git a/folly/test/ExceptionWrapperBenchmark.cpp b/folly/test/ExceptionWrapperBenchmark.cpp
index 31e28f63..ba412fe5 100644
--- a/folly/test/ExceptionWrapperBenchmark.cpp
+++ b/folly/test/ExceptionWrapperBenchmark.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "folly/ExceptionWrapper.h"
+#include <folly/ExceptionWrapper.h>
 
 #include <gflags/gflags.h>
 #include <atomic>
@@ -22,7 +22,7 @@
 #include <stdexcept>
 #include <thread>
 
-#include "folly/Benchmark.h"
+#include <folly/Benchmark.h>
 
 DEFINE_int32(num_threads, 32, "Number of threads to run concurrency "
                               "benchmarks");
diff --git a/folly/test/ExceptionWrapperTest.cpp b/folly/test/ExceptionWrapperTest.cpp
index 27da94f9..8683e89f 100644
--- a/folly/test/ExceptionWrapperTest.cpp
+++ b/folly/test/ExceptionWrapperTest.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 #include <stdexcept>
-#include "folly/ExceptionWrapper.h"
+#include <folly/ExceptionWrapper.h>
 
 using namespace folly;
 
diff --git a/folly/test/FBStringBenchmark.cpp b/folly/test/FBStringBenchmark.cpp
index 7b4b2aec..359f1b46 100644
--- a/folly/test/FBStringBenchmark.cpp
+++ b/folly/test/FBStringBenchmark.cpp
@@ -17,7 +17,7 @@
 //
 // Author: andrei.alexandrescu@fb.com
 
-#include "folly/FBString.h"
+#include <folly/FBString.h>
 
 #include <cstdlib>
 
@@ -28,9 +28,9 @@
 
 #include <gflags/gflags.h>
 
-#include "folly/Foreach.h"
-#include "folly/Random.h"
-#include "folly/Benchmark.h"
+#include <folly/Foreach.h>
+#include <folly/Random.h>
+#include <folly/Benchmark.h>
 
 using namespace std;
 using namespace folly;
@@ -86,10 +86,10 @@ std::list<char> RandomList(unsigned int maxSize) {
 #define BENCHFUN(F) CONCAT(CONCAT(BM_, F), CONCAT(_, STRING))
 
 #define STRING string
-#include "folly/test/FBStringTestBenchmarks.cpp.h"
+#include <folly/test/FBStringTestBenchmarks.cpp.h>
 #undef STRING
 #define STRING fbstring
-#include "folly/test/FBStringTestBenchmarks.cpp.h"
+#include <folly/test/FBStringTestBenchmarks.cpp.h>
 #undef STRING
 
 int main(int argc, char** argv) {
diff --git a/folly/test/FBStringTest.cpp b/folly/test/FBStringTest.cpp
index 41f9bc83..8133b016 100644
--- a/folly/test/FBStringTest.cpp
+++ b/folly/test/FBStringTest.cpp
@@ -17,7 +17,7 @@
 //
 // Author: andrei.alexandrescu@fb.com
 
-#include "folly/FBString.h"
+#include <folly/FBString.h>
 
 #include <cstdlib>
 
@@ -30,10 +30,10 @@
 
 #include <gflags/gflags.h>
 
-#include "folly/Foreach.h"
-#include "folly/Portability.h"
-#include "folly/Random.h"
-#include "folly/Conv.h"
+#include <folly/Foreach.h>
+#include <folly/Portability.h>
+#include <folly/Random.h>
+#include <folly/Conv.h>
 
 using namespace std;
 using namespace folly;
diff --git a/folly/test/FBVectorBenchmark.cpp b/folly/test/FBVectorBenchmark.cpp
index bda0678b..f498e7e8 100644
--- a/folly/test/FBVectorBenchmark.cpp
+++ b/folly/test/FBVectorBenchmark.cpp
@@ -17,11 +17,11 @@
 //
 // Author: andrei.alexandrescu@fb.com
 
-#include "folly/Traits.h"
-#include "folly/Random.h"
-#include "folly/FBString.h"
-#include "folly/FBVector.h"
-#include "folly/Benchmark.h"
+#include <folly/Traits.h>
+#include <folly/Random.h>
+#include <folly/FBString.h>
+#include <folly/FBVector.h>
+#include <folly/Benchmark.h>
 
 #include <gflags/gflags.h>
 
@@ -93,16 +93,16 @@ typedef vector<folly::fbstring> FBStringVector;
 typedef fbvector<folly::fbstring> FBStringFBVector;
 
 #define VECTOR IntVector
-#include "folly/test/FBVectorTestBenchmarks.cpp.h"
+#include <folly/test/FBVectorTestBenchmarks.cpp.h>
 #undef VECTOR
 #define VECTOR IntFBVector
-#include "folly/test/FBVectorTestBenchmarks.cpp.h"
+#include <folly/test/FBVectorTestBenchmarks.cpp.h>
 #undef VECTOR
 #define VECTOR FBStringVector
-#include "folly/test/FBVectorTestBenchmarks.cpp.h"
+#include <folly/test/FBVectorTestBenchmarks.cpp.h>
 #undef VECTOR
 #define VECTOR FBStringFBVector
-#include "folly/test/FBVectorTestBenchmarks.cpp.h"
+#include <folly/test/FBVectorTestBenchmarks.cpp.h>
 #undef VECTOR
 
 int main(int argc, char** argv) {
diff --git a/folly/test/FBVectorTest.cpp b/folly/test/FBVectorTest.cpp
index 1818f6bd..919063e8 100644
--- a/folly/test/FBVectorTest.cpp
+++ b/folly/test/FBVectorTest.cpp
@@ -17,10 +17,10 @@
 //
 // Author: andrei.alexandrescu@fb.com
 
-#include "folly/Traits.h"
-#include "folly/Random.h"
-#include "folly/FBString.h"
-#include "folly/FBVector.h"
+#include <folly/Traits.h>
+#include <folly/Random.h>
+#include <folly/FBString.h>
+#include <folly/FBVector.h>
 
 #include <gflags/gflags.h>
 
diff --git a/folly/test/FileTest.cpp b/folly/test/FileTest.cpp
index 30109252..a7e70921 100644
--- a/folly/test/FileTest.cpp
+++ b/folly/test/FileTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/File.h"
+#include <folly/File.h>
 
 #include <mutex>
 
@@ -22,11 +22,11 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/Benchmark.h"
-#include "folly/String.h"
-#include "folly/Subprocess.h"
-#include "folly/experimental/io/FsUtil.h"
-#include "folly/experimental/TestUtil.h"
+#include <folly/Benchmark.h>
+#include <folly/String.h>
+#include <folly/Subprocess.h>
+#include <folly/experimental/io/FsUtil.h>
+#include <folly/experimental/TestUtil.h>
 
 using namespace folly;
 using namespace folly::test;
diff --git a/folly/test/FileTestLockHelper.cpp b/folly/test/FileTestLockHelper.cpp
index 27dcb88f..44487eb9 100644
--- a/folly/test/FileTestLockHelper.cpp
+++ b/folly/test/FileTestLockHelper.cpp
@@ -17,7 +17,7 @@
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 
-#include "folly/File.h"
+#include <folly/File.h>
 
 DEFINE_bool(s, false, "get shared lock");
 DEFINE_bool(x, false, "get exclusive lock");
diff --git a/folly/test/FileUtilTest.cpp b/folly/test/FileUtilTest.cpp
index d40be3d5..5e711a0c 100644
--- a/folly/test/FileUtilTest.cpp
+++ b/folly/test/FileUtilTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/FileUtil.h"
-#include "folly/detail/FileUtilDetail.h"
+#include <folly/FileUtil.h>
+#include <folly/detail/FileUtilDetail.h>
 
 #include <deque>
 
@@ -23,9 +23,9 @@
 #include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
-#include "folly/Benchmark.h"
-#include "folly/Range.h"
-#include "folly/String.h"
+#include <folly/Benchmark.h>
+#include <folly/Range.h>
+#include <folly/String.h>
 
 namespace folly { namespace test {
 
diff --git a/folly/test/FingerprintTest.cpp b/folly/test/FingerprintTest.cpp
index 9dc729d5..a4cc9142 100644
--- a/folly/test/FingerprintTest.cpp
+++ b/folly/test/FingerprintTest.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "folly/Fingerprint.h"
+#include <folly/Fingerprint.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/detail/SlowFingerprint.h"
-#include "folly/Benchmark.h"
+#include <folly/detail/SlowFingerprint.h>
+#include <folly/Benchmark.h>
 
 using namespace folly;
 using namespace folly::detail;
diff --git a/folly/test/ForeachTest.cpp b/folly/test/ForeachTest.cpp
index 561f2ec2..a4fac00c 100644
--- a/folly/test/ForeachTest.cpp
+++ b/folly/test/ForeachTest.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "folly/Foreach.h"
+#include <folly/Foreach.h>
 
-#include "folly/Benchmark.h"
+#include <folly/Benchmark.h>
 #include <gtest/gtest.h>
 #include <map>
 #include <string>
diff --git a/folly/test/FormatBenchmark.cpp b/folly/test/FormatBenchmark.cpp
index 9b57f921..7acf893a 100644
--- a/folly/test/FormatBenchmark.cpp
+++ b/folly/test/FormatBenchmark.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "folly/Format.h"
+#include <folly/Format.h>
 
 #include <glog/logging.h>
 
-#include "folly/FBVector.h"
-#include "folly/Benchmark.h"
-#include "folly/dynamic.h"
-#include "folly/json.h"
+#include <folly/FBVector.h>
+#include <folly/Benchmark.h>
+#include <folly/dynamic.h>
+#include <folly/json.h>
 
 using namespace folly;
 
diff --git a/folly/test/FormatTest.cpp b/folly/test/FormatTest.cpp
index 3c27dc3e..e49e97ce 100644
--- a/folly/test/FormatTest.cpp
+++ b/folly/test/FormatTest.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include "folly/Format.h"
+#include <folly/Format.h>
 
 #include <glog/logging.h>
 #include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
-#include "folly/FBVector.h"
-#include "folly/FileUtil.h"
-#include "folly/dynamic.h"
-#include "folly/json.h"
+#include <folly/FBVector.h>
+#include <folly/FileUtil.h>
+#include <folly/dynamic.h>
+#include <folly/json.h>
 
 using namespace folly;
 
diff --git a/folly/test/FutexTest.cpp b/folly/test/FutexTest.cpp
index 537914cb..2669a3b9 100644
--- a/folly/test/FutexTest.cpp
+++ b/folly/test/FutexTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/detail/Futex.h"
-#include "folly/test/DeterministicSchedule.h"
+#include <folly/detail/Futex.h>
+#include <folly/test/DeterministicSchedule.h>
 
 #include <chrono>
 #include <thread>
diff --git a/folly/test/GroupVarintTest.cpp b/folly/test/GroupVarintTest.cpp
index ea21f449..9fb279b2 100644
--- a/folly/test/GroupVarintTest.cpp
+++ b/folly/test/GroupVarintTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <stdarg.h>
-#include "folly/GroupVarint.h"
+#include <folly/GroupVarint.h>
 
 // On platforms where it's not supported, GroupVarint will be compiled out.
 #if HAVE_GROUP_VARINT
diff --git a/folly/test/HasMemberFnTraitsTest.cpp b/folly/test/HasMemberFnTraitsTest.cpp
index fba4aba9..7944b4d4 100644
--- a/folly/test/HasMemberFnTraitsTest.cpp
+++ b/folly/test/HasMemberFnTraitsTest.cpp
@@ -18,7 +18,7 @@
  * @author: Marcelo Juchem <marcelo@fb.com>
  */
 
-#include "folly/Traits.h"
+#include <folly/Traits.h>
 
 #include <gtest/gtest.h>
 #include <glog/logging.h>
diff --git a/folly/test/HashTest.cpp b/folly/test/HashTest.cpp
index 685d80b4..e1c6f658 100644
--- a/folly/test/HashTest.cpp
+++ b/folly/test/HashTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/Hash.h"
-#include "folly/MapUtil.h"
+#include <folly/Hash.h>
+#include <folly/MapUtil.h>
 #include <gtest/gtest.h>
 #include <stdint.h>
 #include <unordered_map>
diff --git a/folly/test/HistogramBenchmark.cpp b/folly/test/HistogramBenchmark.cpp
index 94931014..27b08258 100644
--- a/folly/test/HistogramBenchmark.cpp
+++ b/folly/test/HistogramBenchmark.cpp
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "folly/stats/Histogram.h"
+#include <folly/stats/Histogram.h>
 
 #include <gflags/gflags.h>
 
-#include "folly/Benchmark.h"
-#include "folly/Foreach.h"
+#include <folly/Benchmark.h>
+#include <folly/Foreach.h>
 
 using folly::Histogram;
 
diff --git a/folly/test/HistogramTest.cpp b/folly/test/HistogramTest.cpp
index 5635dc5c..c25c0bd8 100644
--- a/folly/test/HistogramTest.cpp
+++ b/folly/test/HistogramTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/stats/Histogram.h"
-#include "folly/stats/Histogram-defs.h"
+#include <folly/stats/Histogram.h>
+#include <folly/stats/Histogram-defs.h>
 
 #include <gflags/gflags.h>
 #include <gtest/gtest.h>
diff --git a/folly/test/IPAddressTest.cpp b/folly/test/IPAddressTest.cpp
index b9cb43de..039999e6 100644
--- a/folly/test/IPAddressTest.cpp
+++ b/folly/test/IPAddressTest.cpp
@@ -18,10 +18,10 @@
 
 #include <gtest/gtest.h>
 
-#include "folly/Bits.h"
-#include "folly/Format.h"
-#include "folly/String.h"
-#include "folly/MacAddress.h"
+#include <folly/Bits.h>
+#include <folly/Format.h>
+#include <folly/String.h>
+#include <folly/MacAddress.h>
 
 using namespace folly;
 using namespace std;
diff --git a/folly/test/IPAddressTest.h b/folly/test/IPAddressTest.h
index a5f4d893..60495292 100644
--- a/folly/test/IPAddressTest.h
+++ b/folly/test/IPAddressTest.h
@@ -26,7 +26,7 @@ extern "C" {
 #include <sys/socket.h>
 }
 
-#include "folly/IPAddress.h"
+#include <folly/IPAddress.h>
 
 namespace folly {
 
diff --git a/folly/test/JsonTest.cpp b/folly/test/JsonTest.cpp
index 7efe1361..0c2b6d5a 100644
--- a/folly/test/JsonTest.cpp
+++ b/folly/test/JsonTest.cpp
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "folly/json.h"
+#include <folly/json.h>
 #include <gtest/gtest.h>
 #include <gflags/gflags.h>
 #include <cmath>
 #include <limits>
 #include <iostream>
 #include <boost/next_prior.hpp>
-#include "folly/Benchmark.h"
+#include <folly/Benchmark.h>
 
 using folly::dynamic;
 using folly::parseJson;
diff --git a/folly/test/LazyTest.cpp b/folly/test/LazyTest.cpp
index b5d53e1f..d2947de2 100644
--- a/folly/test/LazyTest.cpp
+++ b/folly/test/LazyTest.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "folly/Lazy.h"
+#include <folly/Lazy.h>
 
 #include <map>
 #include <functional>
diff --git a/folly/test/LifoSemTests.cpp b/folly/test/LifoSemTests.cpp
index 7bf1cce5..12ec0f2e 100644
--- a/folly/test/LifoSemTests.cpp
+++ b/folly/test/LifoSemTests.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-#include "folly/LifoSem.h"
-#include "folly/test/DeterministicSchedule.h"
+#include <folly/LifoSem.h>
+#include <folly/test/DeterministicSchedule.h>
 
 #include <thread>
 #include <semaphore.h>
 #include <gflags/gflags.h>
 #include <gtest/gtest.h>
 
-#include "folly/Benchmark.h"
-#include "folly/Random.h"
+#include <folly/Benchmark.h>
+#include <folly/Random.h>
 
 using namespace folly;
 using namespace folly::test;
diff --git a/folly/test/MPMCPipelineTest.cpp b/folly/test/MPMCPipelineTest.cpp
index cc6fc64c..f754eda8 100644
--- a/folly/test/MPMCPipelineTest.cpp
+++ b/folly/test/MPMCPipelineTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/MPMCPipeline.h"
+#include <folly/MPMCPipeline.h>
 
 #include <thread>
 #include <vector>
@@ -22,7 +22,7 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/Conv.h"
+#include <folly/Conv.h>
 
 namespace folly { namespace test {
 
diff --git a/folly/test/MacAddressTest.cpp b/folly/test/MacAddressTest.cpp
index 0cea2b82..d40f795a 100644
--- a/folly/test/MacAddressTest.cpp
+++ b/folly/test/MacAddressTest.cpp
@@ -16,8 +16,8 @@
 
 #include <gtest/gtest.h>
 
-#include "folly/IPAddressV6.h"
-#include "folly/MacAddress.h"
+#include <folly/IPAddressV6.h>
+#include <folly/MacAddress.h>
 
 using folly::MacAddress;
 using folly::IPAddressV6;
diff --git a/folly/test/MapUtilTest.cpp b/folly/test/MapUtilTest.cpp
index 60857cb1..89bf1768 100644
--- a/folly/test/MapUtilTest.cpp
+++ b/folly/test/MapUtilTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/MapUtil.h"
+#include <folly/MapUtil.h>
 
 #include <map>
 #include <gtest/gtest.h>
diff --git a/folly/test/MemoryMappingTest.cpp b/folly/test/MemoryMappingTest.cpp
index 54c3a2bf..2a18f206 100644
--- a/folly/test/MemoryMappingTest.cpp
+++ b/folly/test/MemoryMappingTest.cpp
@@ -16,7 +16,7 @@
 
 #include <cstdlib>
 #include <gtest/gtest.h>
-#include "folly/MemoryMapping.h"
+#include <folly/MemoryMapping.h>
 
 namespace folly {
 
diff --git a/folly/test/MemoryTest.cpp b/folly/test/MemoryTest.cpp
index db0c9837..8ce0c90e 100644
--- a/folly/test/MemoryTest.cpp
+++ b/folly/test/MemoryTest.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "folly/Memory.h"
-#include "folly/Arena.h"
-#include "folly/String.h"
+#include <folly/Memory.h>
+#include <folly/Arena.h>
+#include <folly/String.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
diff --git a/folly/test/MergeTest.cpp b/folly/test/MergeTest.cpp
index a538012d..1e2a983f 100644
--- a/folly/test/MergeTest.cpp
+++ b/folly/test/MergeTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Merge.h"
+#include <folly/Merge.h>
 #include <gtest/gtest.h>
 #include <map>
 #include <vector>
diff --git a/folly/test/MoveWrapperTest.cpp b/folly/test/MoveWrapperTest.cpp
index d427e1f8..9856943a 100644
--- a/folly/test/MoveWrapperTest.cpp
+++ b/folly/test/MoveWrapperTest.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include "folly/MoveWrapper.h"
+#include <folly/MoveWrapper.h>
 #include <memory>
 
 namespace folly {
diff --git a/folly/test/OptionalTest.cpp b/folly/test/OptionalTest.cpp
index 458e2af8..ff82abdc 100644
--- a/folly/test/OptionalTest.cpp
+++ b/folly/test/OptionalTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Optional.h"
+#include <folly/Optional.h>
 
 #include <memory>
 #include <vector>
diff --git a/folly/test/PackedSyncPtrTest.cpp b/folly/test/PackedSyncPtrTest.cpp
index 0406b56d..adcc3504 100644
--- a/folly/test/PackedSyncPtrTest.cpp
+++ b/folly/test/PackedSyncPtrTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/PackedSyncPtr.h"
+#include <folly/PackedSyncPtr.h>
 
 #include <cinttypes>
 #include <gtest/gtest.h>
diff --git a/folly/test/PaddedTest.cpp b/folly/test/PaddedTest.cpp
index 1fd75137..98978265 100644
--- a/folly/test/PaddedTest.cpp
+++ b/folly/test/PaddedTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Padded.h"
+#include <folly/Padded.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
diff --git a/folly/test/PortabilityTest.cpp b/folly/test/PortabilityTest.cpp
index ae871dc3..ca319c35 100644
--- a/folly/test/PortabilityTest.cpp
+++ b/folly/test/PortabilityTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Portability.h"
+#include <folly/Portability.h>
 
 #include <memory>
 
diff --git a/folly/test/ProducerConsumerQueueBenchmark.cpp b/folly/test/ProducerConsumerQueueBenchmark.cpp
index cea07874..84c9563c 100644
--- a/folly/test/ProducerConsumerQueueBenchmark.cpp
+++ b/folly/test/ProducerConsumerQueueBenchmark.cpp
@@ -23,10 +23,10 @@
 
 #include <gflags/gflags.h>
 #include <glog/logging.h>
-#include "folly/Benchmark.h"
-#include "folly/stats/Histogram.h"
-#include "folly/stats/Histogram-defs.h"
-#include "folly/ProducerConsumerQueue.h"
+#include <folly/Benchmark.h>
+#include <folly/stats/Histogram.h>
+#include <folly/stats/Histogram-defs.h>
+#include <folly/ProducerConsumerQueue.h>
 
 namespace {
 
diff --git a/folly/test/ProducerConsumerQueueTest.cpp b/folly/test/ProducerConsumerQueueTest.cpp
index 3f0d50b3..de72c88b 100644
--- a/folly/test/ProducerConsumerQueueTest.cpp
+++ b/folly/test/ProducerConsumerQueueTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/ProducerConsumerQueue.h"
+#include <folly/ProducerConsumerQueue.h>
 
 #include <gtest/gtest.h>
 #include <vector>
diff --git a/folly/test/RWSpinLockTest.cpp b/folly/test/RWSpinLockTest.cpp
index 2369eef0..077c061a 100644
--- a/folly/test/RWSpinLockTest.cpp
+++ b/folly/test/RWSpinLockTest.cpp
@@ -26,7 +26,7 @@
 #include <gtest/gtest.h>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
-#include "folly/RWSpinLock.h"
+#include <folly/RWSpinLock.h>
 
 DEFINE_int32(num_threads, 8, "num threads");
 
diff --git a/folly/test/RandomTest.cpp b/folly/test/RandomTest.cpp
index e6f11f03..8653faf6 100644
--- a/folly/test/RandomTest.cpp
+++ b/folly/test/RandomTest.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include "folly/Random.h"
-#include "folly/Range.h"
-#include "folly/Benchmark.h"
-#include "folly/Foreach.h"
+#include <folly/Random.h>
+#include <folly/Range.h>
+#include <folly/Benchmark.h>
+#include <folly/Foreach.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
diff --git a/folly/test/RangeFindBenchmark.cpp b/folly/test/RangeFindBenchmark.cpp
index e9a302bb..b4bc5598 100644
--- a/folly/test/RangeFindBenchmark.cpp
+++ b/folly/test/RangeFindBenchmark.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "folly/Range.h"
-#include "folly/Benchmark.h"
-#include "folly/Foreach.h"
+#include <folly/Range.h>
+#include <folly/Benchmark.h>
+#include <folly/Foreach.h>
 #include <algorithm>
 #include <iostream>
 #include <random>
diff --git a/folly/test/RangeTest.cpp b/folly/test/RangeTest.cpp
index 8cbbfb09..d088c9ce 100644
--- a/folly/test/RangeTest.cpp
+++ b/folly/test/RangeTest.cpp
@@ -17,7 +17,7 @@
 // @author Kristina Holst (kholst@fb.com)
 // @author Andrei Alexandrescu (andrei.alexandrescu@fb.com)
 
-#include "folly/Range.h"
+#include <folly/Range.h>
 
 #include <array>
 #include <boost/range/concepts.hpp>
diff --git a/folly/test/SafeAssertTest.cpp b/folly/test/SafeAssertTest.cpp
index 4ae06916..db075411 100644
--- a/folly/test/SafeAssertTest.cpp
+++ b/folly/test/SafeAssertTest.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "folly/SafeAssert.h"
+#include <folly/SafeAssert.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/Benchmark.h"
+#include <folly/Benchmark.h>
 
 using namespace folly;
 
diff --git a/folly/test/ScopeGuardTest.cpp b/folly/test/ScopeGuardTest.cpp
index 71044b81..285dd445 100644
--- a/folly/test/ScopeGuardTest.cpp
+++ b/folly/test/ScopeGuardTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/ScopeGuard.h"
-#include "folly/Portability.h"
+#include <folly/ScopeGuard.h>
+#include <folly/Portability.h>
 
 #include <gflags/gflags.h>
 #include <gtest/gtest.h>
diff --git a/folly/test/SmallLocksTest.cpp b/folly/test/SmallLocksTest.cpp
index 3a33f17a..f0fd291d 100644
--- a/folly/test/SmallLocksTest.cpp
+++ b/folly/test/SmallLocksTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/SmallLocks.h"
+#include <folly/SmallLocks.h>
 #include <cassert>
 #include <cstdio>
 #include <mutex>
diff --git a/folly/test/SpookyHashV1Test.cpp b/folly/test/SpookyHashV1Test.cpp
index b1a89284..6a3ecf46 100644
--- a/folly/test/SpookyHashV1Test.cpp
+++ b/folly/test/SpookyHashV1Test.cpp
@@ -20,8 +20,8 @@
 #define __STDC_FORMAT_MACROS 1
 #endif
 
-#include "folly/SpookyHashV1.h"
-#include "folly/Benchmark.h"
+#include <folly/SpookyHashV1.h>
+#include <folly/Benchmark.h>
 
 #include <cinttypes>
 #include <cstdio>
diff --git a/folly/test/SpookyHashV2Test.cpp b/folly/test/SpookyHashV2Test.cpp
index 376a2765..74369cd4 100644
--- a/folly/test/SpookyHashV2Test.cpp
+++ b/folly/test/SpookyHashV2Test.cpp
@@ -20,8 +20,8 @@
 #define __STDC_FORMAT_MACROS 1
 #endif
 
-#include "folly/SpookyHashV2.h"
-#include "folly/Benchmark.h"
+#include <folly/SpookyHashV2.h>
+#include <folly/Benchmark.h>
 
 #include <cinttypes>
 #include <cstdio>
diff --git a/folly/test/StringTest.cpp b/folly/test/StringTest.cpp
index bfad26e9..0bcc2d1e 100644
--- a/folly/test/StringTest.cpp
+++ b/folly/test/StringTest.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "folly/String.h"
+#include <folly/String.h>
 
 #include <random>
 #include <boost/algorithm/string.hpp>
 #include <gtest/gtest.h>
 
-#include "folly/Benchmark.h"
+#include <folly/Benchmark.h>
 
 using namespace folly;
 using namespace std;
diff --git a/folly/test/SubprocessTest.cpp b/folly/test/SubprocessTest.cpp
index 098b66b3..a2ffc8dc 100644
--- a/folly/test/SubprocessTest.cpp
+++ b/folly/test/SubprocessTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Subprocess.h"
+#include <folly/Subprocess.h>
 
 #include <unistd.h>
 #include <sys/types.h>
@@ -24,14 +24,14 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/Exception.h"
-#include "folly/Format.h"
-#include "folly/FileUtil.h"
-#include "folly/String.h"
-#include "folly/gen/Base.h"
-#include "folly/gen/File.h"
-#include "folly/gen/String.h"
-#include "folly/experimental/io/FsUtil.h"
+#include <folly/Exception.h>
+#include <folly/Format.h>
+#include <folly/FileUtil.h>
+#include <folly/String.h>
+#include <folly/gen/Base.h>
+#include <folly/gen/File.h>
+#include <folly/gen/String.h>
+#include <folly/experimental/io/FsUtil.h>
 
 using namespace folly;
 
diff --git a/folly/test/SubprocessTestParentDeathHelper.cpp b/folly/test/SubprocessTestParentDeathHelper.cpp
index d752b84c..e5db86d1 100644
--- a/folly/test/SubprocessTestParentDeathHelper.cpp
+++ b/folly/test/SubprocessTestParentDeathHelper.cpp
@@ -31,8 +31,8 @@
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 
-#include "folly/Conv.h"
-#include "folly/Subprocess.h"
+#include <folly/Conv.h>
+#include <folly/Subprocess.h>
 
 using folly::Subprocess;
 
diff --git a/folly/test/SynchronizedTest.cpp b/folly/test/SynchronizedTest.cpp
index dd23dd45..17ede740 100644
--- a/folly/test/SynchronizedTest.cpp
+++ b/folly/test/SynchronizedTest.cpp
@@ -18,9 +18,9 @@
 
 // Test bed for folly/Synchronized.h
 
-#include "folly/Synchronized.h"
-#include "folly/RWSpinLock.h"
-#include "folly/test/SynchronizedTestLib.h"
+#include <folly/Synchronized.h>
+#include <folly/RWSpinLock.h>
+#include <folly/test/SynchronizedTestLib.h>
 #include <gtest/gtest.h>
 
 
diff --git a/folly/test/SynchronizedTestLib-inl.h b/folly/test/SynchronizedTestLib-inl.h
index cbd43624..aa2e3dcb 100644
--- a/folly/test/SynchronizedTestLib-inl.h
+++ b/folly/test/SynchronizedTestLib-inl.h
@@ -25,9 +25,9 @@
 #include <thread>
 #include <vector>
 #include <glog/logging.h>
-#include "folly/Foreach.h"
-#include "folly/Random.h"
-#include "folly/Synchronized.h"
+#include <folly/Foreach.h>
+#include <folly/Random.h>
+#include <folly/Synchronized.h>
 
 
 static const auto seed = folly::randomNumberSeed();
diff --git a/folly/test/SynchronizedTestLib.h b/folly/test/SynchronizedTestLib.h
index c3602cb7..340d564d 100644
--- a/folly/test/SynchronizedTestLib.h
+++ b/folly/test/SynchronizedTestLib.h
@@ -44,6 +44,6 @@ template <class Mutex> void testTimedSynchronizedWithConst();
 
 template <class Mutex> void testConstCopy();
 
-#include "folly/test/SynchronizedTestLib-inl.h"
+#include <folly/test/SynchronizedTestLib-inl.h>
 
 #endif /* FOLLY_TEST_SYNCHRONIZEDTESTLIB_H */
diff --git a/folly/test/ThreadCachedArenaTest.cpp b/folly/test/ThreadCachedArenaTest.cpp
index a5766cc7..8f89d8ad 100644
--- a/folly/test/ThreadCachedArenaTest.cpp
+++ b/folly/test/ThreadCachedArenaTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/ThreadCachedArena.h"
-#include "folly/Memory.h"
+#include <folly/ThreadCachedArena.h>
+#include <folly/Memory.h>
 
 #include <map>
 #include <mutex>
@@ -28,8 +28,8 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/Range.h"
-#include "folly/Benchmark.h"
+#include <folly/Range.h>
+#include <folly/Benchmark.h>
 
 using namespace folly;
 
diff --git a/folly/test/ThreadCachedIntTest.cpp b/folly/test/ThreadCachedIntTest.cpp
index a84a82fd..231763d5 100644
--- a/folly/test/ThreadCachedIntTest.cpp
+++ b/folly/test/ThreadCachedIntTest.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include "folly/ThreadCachedInt.h"
-#include "folly/Hash.h"
+#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 "folly/Benchmark.h"
+#include <folly/Benchmark.h>
 
 using namespace folly;
 
diff --git a/folly/test/ThreadLocalTest.cpp b/folly/test/ThreadLocalTest.cpp
index 332fa80e..a5de4916 100644
--- a/folly/test/ThreadLocalTest.cpp
+++ b/folly/test/ThreadLocalTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/ThreadLocal.h"
+#include <folly/ThreadLocal.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -35,7 +35,7 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/Benchmark.h"
+#include <folly/Benchmark.h>
 
 using namespace folly;
 
diff --git a/folly/test/TimeoutQueueTest.cpp b/folly/test/TimeoutQueueTest.cpp
index fcbe0d2d..a07bc22e 100644
--- a/folly/test/TimeoutQueueTest.cpp
+++ b/folly/test/TimeoutQueueTest.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <gtest/gtest.h>
-#include "folly/TimeoutQueue.h"
+#include <folly/TimeoutQueue.h>
 
 using namespace folly;
 
diff --git a/folly/test/TimeseriesBenchmark.cpp b/folly/test/TimeseriesBenchmark.cpp
index a0be5771..9ce8ba4a 100644
--- a/folly/test/TimeseriesBenchmark.cpp
+++ b/folly/test/TimeseriesBenchmark.cpp
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "folly/stats/BucketedTimeSeries.h"
-#include "folly/stats/BucketedTimeSeries-defs.h"
+#include <folly/stats/BucketedTimeSeries.h>
+#include <folly/stats/BucketedTimeSeries-defs.h>
 
 #include <glog/logging.h>
 
-#include "folly/Benchmark.h"
+#include <folly/Benchmark.h>
 
 using std::chrono::seconds;
 using folly::BenchmarkSuspender;
diff --git a/folly/test/TimeseriesHistogramTest.cpp b/folly/test/TimeseriesHistogramTest.cpp
index ed49b967..e106e881 100644
--- a/folly/test/TimeseriesHistogramTest.cpp
+++ b/folly/test/TimeseriesHistogramTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/stats/TimeseriesHistogram.h"
-#include "folly/stats/TimeseriesHistogram-defs.h"
+#include <folly/stats/TimeseriesHistogram.h>
+#include <folly/stats/TimeseriesHistogram-defs.h>
 
 #include <gtest/gtest.h>
 
diff --git a/folly/test/TimeseriesTest.cpp b/folly/test/TimeseriesTest.cpp
index 0d97f275..3f680422 100644
--- a/folly/test/TimeseriesTest.cpp
+++ b/folly/test/TimeseriesTest.cpp
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#include "folly/stats/BucketedTimeSeries.h"
-#include "folly/stats/BucketedTimeSeries-defs.h"
-#include "folly/stats/MultiLevelTimeSeries.h"
-#include "folly/stats/MultiLevelTimeSeries-defs.h"
+#include <folly/stats/BucketedTimeSeries.h>
+#include <folly/stats/BucketedTimeSeries-defs.h>
+#include <folly/stats/MultiLevelTimeSeries.h>
+#include <folly/stats/MultiLevelTimeSeries-defs.h>
 
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/Foreach.h"
+#include <folly/Foreach.h>
 
 using std::chrono::seconds;
 using std::string;
diff --git a/folly/test/TraitsTest.cpp b/folly/test/TraitsTest.cpp
index 3813ab9a..129ad83d 100644
--- a/folly/test/TraitsTest.cpp
+++ b/folly/test/TraitsTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "folly/Benchmark.h"
-#include "folly/Traits.h"
+#include <folly/Benchmark.h>
+#include <folly/Traits.h>
 
 #include <gflags/gflags.h>
 #include <gtest/gtest.h>
diff --git a/folly/test/UriTest.cpp b/folly/test/UriTest.cpp
index a209f255..7edc84d9 100644
--- a/folly/test/UriTest.cpp
+++ b/folly/test/UriTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Uri.h"
+#include <folly/Uri.h>
 
 #include <boost/algorithm/string.hpp>
 #include <glog/logging.h>
diff --git a/folly/test/VarintTest.cpp b/folly/test/VarintTest.cpp
index 1ab4ed0b..812b888b 100644
--- a/folly/test/VarintTest.cpp
+++ b/folly/test/VarintTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/Varint.h"
+#include <folly/Varint.h>
 
 #include <array>
 #include <initializer_list>
@@ -24,8 +24,8 @@
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
-#include "folly/Benchmark.h"
-#include "folly/Random.h"
+#include <folly/Benchmark.h>
+#include <folly/Random.h>
 
 DEFINE_int32(random_seed, folly::randomNumberSeed(), "random seed");
 
diff --git a/folly/test/function_benchmark/benchmark_impl.cpp b/folly/test/function_benchmark/benchmark_impl.cpp
index 9dceb495..5bd25f14 100644
--- a/folly/test/function_benchmark/benchmark_impl.cpp
+++ b/folly/test/function_benchmark/benchmark_impl.cpp
@@ -1,7 +1,22 @@
-// Copyright 2004-present Facebook.  All rights reserved.
-#include "folly/test/function_benchmark/benchmark_impl.h"
+/*
+ * Copyright 2014 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <folly/test/function_benchmark/benchmark_impl.h>
 
-#include "folly/test/function_benchmark/test_functions.h"
+#include <folly/test/function_benchmark/test_functions.h>
 
 /*
  * These functions are defined in a separate file so that gcc won't be able to
diff --git a/folly/test/function_benchmark/main.cpp b/folly/test/function_benchmark/main.cpp
index 3857ba8e..c2d03eca 100644
--- a/folly/test/function_benchmark/main.cpp
+++ b/folly/test/function_benchmark/main.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "folly/test/function_benchmark/benchmark_impl.h"
-#include "folly/test/function_benchmark/test_functions.h"
+#include <folly/test/function_benchmark/benchmark_impl.h>
+#include <folly/test/function_benchmark/test_functions.h>
 
-#include "folly/Benchmark.h"
-#include "folly/ScopeGuard.h"
+#include <folly/Benchmark.h>
+#include <folly/ScopeGuard.h>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 
diff --git a/folly/test/function_benchmark/test_functions.cpp b/folly/test/function_benchmark/test_functions.cpp
index 5cffa0e3..d5c4ddd4 100644
--- a/folly/test/function_benchmark/test_functions.cpp
+++ b/folly/test/function_benchmark/test_functions.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/test/function_benchmark/test_functions.h"
+#include <folly/test/function_benchmark/test_functions.h>
 
 /*
  * These functions are defined in a separate file so that
diff --git a/folly/test/small_vector_test.cpp b/folly/test/small_vector_test.cpp
index 65a672d9..89362d38 100644
--- a/folly/test/small_vector_test.cpp
+++ b/folly/test/small_vector_test.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/small_vector.h"
+#include <folly/small_vector.h>
 
 #include <gtest/gtest.h>
 #include <string>
@@ -24,7 +24,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "folly/Conv.h"
+#include <folly/Conv.h>
 
 using folly::small_vector;
 using namespace folly::small_vector_policy;
diff --git a/folly/test/sorted_vector_test.cpp b/folly/test/sorted_vector_test.cpp
index 2ea86d3e..eef89715 100644
--- a/folly/test/sorted_vector_test.cpp
+++ b/folly/test/sorted_vector_test.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "folly/sorted_vector_types.h"
+#include <folly/sorted_vector_types.h>
 #include <gtest/gtest.h>
 #include <list>
 
diff --git a/folly/test/stl_tests/StlVectorTest.cpp b/folly/test/stl_tests/StlVectorTest.cpp
index 7a999564..5ad8b9da 100644
--- a/folly/test/stl_tests/StlVectorTest.cpp
+++ b/folly/test/stl_tests/StlVectorTest.cpp
@@ -165,7 +165,7 @@ THOUGHTS:
 #include <vector>
 #define VECTOR_ std::vector
 #else
-#include "folly/FBVector.h"
+#include <folly/FBVector.h>
 #define VECTOR_ folly::fbvector
 #endif
 
@@ -184,8 +184,8 @@ THOUGHTS:
 #include <cstddef>
 #include <iomanip>
 
-#include "folly/ScopeGuard.h"
-#include "folly/Conv.h"
+#include <folly/ScopeGuard.h>
+#include <folly/Conv.h>
 #include <boost/preprocessor.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <gflags/gflags.h>
diff --git a/folly/wangle/Future.h b/folly/wangle/Future.h
index 1acf0973..6a75f829 100644
--- a/folly/wangle/Future.h
+++ b/folly/wangle/Future.h
@@ -23,7 +23,7 @@
 #include <type_traits>
 #include <vector>
 
-#include "folly/MoveWrapper.h"
+#include <folly/MoveWrapper.h>
 #include "Promise.h"
 #include "Try.h"
 
diff --git a/folly/wangle/InlineExecutor.h b/folly/wangle/InlineExecutor.h
index f86e48bd..48f82bdd 100644
--- a/folly/wangle/InlineExecutor.h
+++ b/folly/wangle/InlineExecutor.h
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "folly/wangle/Executor.h"
+#include <folly/wangle/Executor.h>
 
 namespace folly { namespace wangle {
 
diff --git a/folly/wangle/Later-inl.h b/folly/wangle/Later-inl.h
index fa9b86b1..c92ceb55 100644
--- a/folly/wangle/Later-inl.h
+++ b/folly/wangle/Later-inl.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "folly/wangle/Executor.h"
-#include "folly/wangle/Future.h"
-#include "folly/Optional.h"
+#include <folly/wangle/Executor.h>
+#include <folly/wangle/Future.h>
+#include <folly/Optional.h>
 
 namespace folly { namespace wangle {
 
diff --git a/folly/wangle/Later.h b/folly/wangle/Later.h
index c01f293e..84430135 100644
--- a/folly/wangle/Later.h
+++ b/folly/wangle/Later.h
@@ -16,9 +16,9 @@
 
 #pragma once
 
-#include "folly/wangle/Executor.h"
-#include "folly/wangle/Future.h"
-#include "folly/Optional.h"
+#include <folly/wangle/Executor.h>
+#include <folly/wangle/Future.h>
+#include <folly/Optional.h>
 
 namespace folly { namespace wangle {
 
diff --git a/folly/wangle/ManualExecutor.h b/folly/wangle/ManualExecutor.h
index 1eb569f0..76be4b43 100644
--- a/folly/wangle/ManualExecutor.h
+++ b/folly/wangle/ManualExecutor.h
@@ -15,7 +15,7 @@
  */
 
 #pragma once
-#include "folly/wangle/Executor.h"
+#include <folly/wangle/Executor.h>
 #include <semaphore.h>
 #include <memory>
 #include <mutex>
diff --git a/folly/wangle/QueuedImmediateExecutor.cpp b/folly/wangle/QueuedImmediateExecutor.cpp
index 2df5bd3a..05a3b891 100644
--- a/folly/wangle/QueuedImmediateExecutor.cpp
+++ b/folly/wangle/QueuedImmediateExecutor.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "QueuedImmediateExecutor.h"
-#include "folly/ThreadLocal.h"
+#include <folly/ThreadLocal.h>
 #include <queue>
 
 namespace folly { namespace wangle {
diff --git a/folly/wangle/QueuedImmediateExecutor.h b/folly/wangle/QueuedImmediateExecutor.h
index 40e08315..46f14d4d 100644
--- a/folly/wangle/QueuedImmediateExecutor.h
+++ b/folly/wangle/QueuedImmediateExecutor.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include "folly/wangle/Executor.h"
+#include <folly/wangle/Executor.h>
 
 namespace folly { namespace wangle {
 
diff --git a/folly/wangle/test/ExecutorTest.cpp b/folly/wangle/test/ExecutorTest.cpp
index 423b7091..1e60ab0b 100644
--- a/folly/wangle/test/ExecutorTest.cpp
+++ b/folly/wangle/test/ExecutorTest.cpp
@@ -15,9 +15,9 @@
  */
 
 #include <gtest/gtest.h>
-#include "folly/wangle/InlineExecutor.h"
-#include "folly/wangle/ManualExecutor.h"
-#include "folly/wangle/QueuedImmediateExecutor.h"
+#include <folly/wangle/InlineExecutor.h>
+#include <folly/wangle/ManualExecutor.h>
+#include <folly/wangle/QueuedImmediateExecutor.h>
 
 using namespace folly::wangle;
 using namespace std::chrono;
diff --git a/folly/wangle/test/FutureTest.cpp b/folly/wangle/test/FutureTest.cpp
index df99aebb..97dd82a8 100644
--- a/folly/wangle/test/FutureTest.cpp
+++ b/folly/wangle/test/FutureTest.cpp
@@ -23,8 +23,8 @@
 #include <thread>
 #include <type_traits>
 #include <unistd.h>
-#include "folly/wangle/Executor.h"
-#include "folly/wangle/Future.h"
+#include <folly/wangle/Executor.h>
+#include <folly/wangle/Future.h>
 
 using namespace folly::wangle;
 using std::pair;
diff --git a/folly/wangle/test/LaterTest.cpp b/folly/wangle/test/LaterTest.cpp
index a1ad05e1..5a00cb5e 100644
--- a/folly/wangle/test/LaterTest.cpp
+++ b/folly/wangle/test/LaterTest.cpp
@@ -17,9 +17,9 @@
 #include <gtest/gtest.h>
 #include <thread>
 
-#include "folly/wangle/ManualExecutor.h"
-#include "folly/wangle/InlineExecutor.h"
-#include "folly/wangle/Later.h"
+#include <folly/wangle/ManualExecutor.h>
+#include <folly/wangle/InlineExecutor.h>
+#include <folly/wangle/Later.h>
 
 using namespace folly::wangle;
 
diff --git a/folly/wangle/test/Thens.h b/folly/wangle/test/Thens.h
index 455f2d6f..dc66cc17 100644
--- a/folly/wangle/test/Thens.h
+++ b/folly/wangle/test/Thens.h
@@ -17,8 +17,8 @@
 #pragma once
 #include <gtest/gtest.h>
 #include <memory>
-#include "folly/wangle/Future.h"
-#include "folly/wangle/Executor.h"
+#include <folly/wangle/Future.h>
+#include <folly/wangle/Executor.h>
 
 using namespace folly::wangle;
 using namespace std;
diff --git a/folly/wangle/test/ThreadGateTest.cpp b/folly/wangle/test/ThreadGateTest.cpp
index 41ae3cb2..83bbbe94 100644
--- a/folly/wangle/test/ThreadGateTest.cpp
+++ b/folly/wangle/test/ThreadGateTest.cpp
@@ -18,10 +18,10 @@
 #include <thread>
 #include <future>
 
-#include "folly/wangle/Executor.h"
-#include "folly/wangle/ManualExecutor.h"
-#include "folly/wangle/ThreadGate.h"
-#include "folly/wangle/GenericThreadGate.h"
+#include <folly/wangle/Executor.h>
+#include <folly/wangle/ManualExecutor.h>
+#include <folly/wangle/ThreadGate.h>
+#include <folly/wangle/GenericThreadGate.h>
 
 using namespace folly::wangle;
 using std::make_shared;
diff --git a/folly/wangle/test/Try.cpp b/folly/wangle/test/Try.cpp
index f8affaba..a472bed6 100644
--- a/folly/wangle/test/Try.cpp
+++ b/folly/wangle/test/Try.cpp
@@ -16,8 +16,8 @@
 
 #include <gtest/gtest.h>
 
-#include "folly/Memory.h"
-#include "folly/wangle/Try.h"
+#include <folly/Memory.h>
+#include <folly/wangle/Try.h>
 
 using namespace folly::wangle;