From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Thu, 13 Jul 2017 02:53:53 +0000 (-0700)
Subject: Sort #include lines
X-Git-Tag: v2017.07.17.00~15
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=folly.git;a=commitdiff_plain;h=520e20a8baebc98a5ec84d67865da4cf9819f88a;hp=4ac665a688925f19e1ccebd01672cf7cb30034d1

Sort #include lines

Summary: [Folly] Sort `#include` lines, as required by `clang-format`.

Reviewed By: igorsugak, Orvid

Differential Revision: D5405153

fbshipit-source-id: 3bb1c2b84271bcf7a195e07680777dbfdd499823
---

diff --git a/folly/Arena.h b/folly/Arena.h
index f70988f0..cf010f3d 100644
--- a/folly/Arena.h
+++ b/folly/Arena.h
@@ -21,6 +21,7 @@
 #include <limits>
 #include <stdexcept>
 #include <utility>
+
 #include <boost/intrusive/slist.hpp>
 
 #include <folly/Conv.h>
diff --git a/folly/AtomicHashMap.h b/folly/AtomicHashMap.h
index 70d71491..962e9de9 100644
--- a/folly/AtomicHashMap.h
+++ b/folly/AtomicHashMap.h
@@ -86,9 +86,9 @@
 #include <boost/noncopyable.hpp>
 #include <boost/type_traits/is_convertible.hpp>
 
-#include <stdexcept>
-#include <functional>
 #include <atomic>
+#include <functional>
+#include <stdexcept>
 
 #include <folly/AtomicHashArray.h>
 #include <folly/Foreach.h>
diff --git a/folly/AtomicUnorderedMap.h b/folly/AtomicUnorderedMap.h
index 45877e1c..3a13aa9f 100644
--- a/folly/AtomicUnorderedMap.h
+++ b/folly/AtomicUnorderedMap.h
@@ -17,11 +17,14 @@
 #pragma once
 
 #include <atomic>
+#include <cstdint>
 #include <functional>
+#include <limits>
 #include <stdexcept>
 #include <system_error>
 #include <type_traits>
-#include <stdint.h>
+
+#include <boost/type_traits/has_trivial_destructor.hpp>
 
 #include <folly/Bits.h>
 #include <folly/Conv.h>
@@ -31,9 +34,6 @@
 #include <folly/portability/SysMman.h>
 #include <folly/portability/Unistd.h>
 
-#include <boost/type_traits/has_trivial_destructor.hpp>
-#include <limits>
-
 namespace folly {
 
 /// You're probably reading this because you are looking for an
diff --git a/folly/Benchmark.cpp b/folly/Benchmark.cpp
index ecb7a8af..8130646d 100644
--- a/folly/Benchmark.cpp
+++ b/folly/Benchmark.cpp
@@ -17,18 +17,20 @@
 // @author Andrei Alexandrescu (andrei.alexandrescu@fb.com)
 
 #include <folly/Benchmark.h>
-#include <folly/Foreach.h>
-#include <folly/json.h>
-#include <folly/String.h>
 
 #include <algorithm>
-#include <boost/regex.hpp>
 #include <cmath>
+#include <cstring>
 #include <iostream>
 #include <limits>
 #include <utility>
 #include <vector>
-#include <cstring>
+
+#include <boost/regex.hpp>
+
+#include <folly/Foreach.h>
+#include <folly/String.h>
+#include <folly/json.h>
 
 using namespace std;
 
diff --git a/folly/Bits.h b/folly/Bits.h
index ade5bbee..940b7bf0 100644
--- a/folly/Bits.h
+++ b/folly/Bits.h
@@ -62,21 +62,21 @@
 #define FOLLY_INTRINSIC_CONSTEXPR const
 #endif
 
-#include <folly/Portability.h>
-#include <folly/portability/Builtins.h>
-
-#include <folly/Assume.h>
-#include <folly/detail/BitIteratorDetail.h>
-#include <folly/Likely.h>
-
 #include <cassert>
-#include <cstring>
 #include <cinttypes>
+#include <cstdint>
+#include <cstring>
 #include <iterator>
 #include <limits>
 #include <type_traits>
+
 #include <boost/iterator/iterator_adaptor.hpp>
-#include <stdint.h>
+
+#include <folly/Assume.h>
+#include <folly/Likely.h>
+#include <folly/Portability.h>
+#include <folly/detail/BitIteratorDetail.h>
+#include <folly/portability/Builtins.h>
 
 namespace folly {
 
diff --git a/folly/ConcurrentSkipList-inl.h b/folly/ConcurrentSkipList-inl.h
index 122f21c6..61279a96 100644
--- a/folly/ConcurrentSkipList-inl.h
+++ b/folly/ConcurrentSkipList-inl.h
@@ -26,6 +26,7 @@
 #include <mutex>
 #include <type_traits>
 #include <vector>
+
 #include <boost/noncopyable.hpp>
 #include <boost/random.hpp>
 #include <boost/type_traits.hpp>
diff --git a/folly/ConcurrentSkipList.h b/folly/ConcurrentSkipList.h
index 8b06f331..a1a694a6 100644
--- a/folly/ConcurrentSkipList.h
+++ b/folly/ConcurrentSkipList.h
@@ -124,6 +124,7 @@ Sample usage:
 #include <limits>
 #include <memory>
 #include <type_traits>
+
 #include <boost/iterator/iterator_facade.hpp>
 #include <glog/logging.h>
 
diff --git a/folly/CpuId.h b/folly/CpuId.h
index bbd36c21..bcbea197 100644
--- a/folly/CpuId.h
+++ b/folly/CpuId.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <cstdint>
+
 #include <folly/Portability.h>
 
 #ifdef _MSC_VER
diff --git a/folly/Demangle.cpp b/folly/Demangle.cpp
index 7145096c..14eb1ad7 100644
--- a/folly/Demangle.cpp
+++ b/folly/Demangle.cpp
@@ -17,13 +17,13 @@
 #include <folly/Demangle.h>
 
 #include <algorithm>
-#include <string.h>
+#include <cstring>
 
 #include <folly/Malloc.h>
 #include <folly/portability/Config.h>
 
 #if FOLLY_HAVE_CPLUS_DEMANGLE_V3_CALLBACK
-# include <cxxabi.h>
+#include <cxxabi.h>
 
 // From libiberty
 //
diff --git a/folly/DiscriminatedPtr.h b/folly/DiscriminatedPtr.h
index 0d485f50..0195beac 100644
--- a/folly/DiscriminatedPtr.h
+++ b/folly/DiscriminatedPtr.h
@@ -28,7 +28,9 @@
 
 #include <limits>
 #include <stdexcept>
+
 #include <glog/logging.h>
+
 #include <folly/Likely.h>
 #include <folly/Portability.h>
 #include <folly/detail/DiscriminatedPtrDetail.h>
diff --git a/folly/DynamicConverter.h b/folly/DynamicConverter.h
index 5da62711..e73c19c2 100644
--- a/folly/DynamicConverter.h
+++ b/folly/DynamicConverter.h
@@ -18,8 +18,15 @@
 
 #pragma once
 
-#include <folly/dynamic.h>
+#include <iterator>
+#include <type_traits>
+
+#include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/mpl/has_xxx.hpp>
+
+#include <folly/Likely.h>
 #include <folly/Traits.h>
+#include <folly/dynamic.h>
 
 namespace folly {
   template <typename T> T convertTo(const dynamic&);
@@ -39,13 +46,6 @@ namespace folly {
  * See docs/DynamicConverter.md for supported types and customization
  */
 
-
-#include <type_traits>
-#include <iterator>
-#include <boost/iterator/iterator_adaptor.hpp>
-#include <boost/mpl/has_xxx.hpp>
-#include <folly/Likely.h>
-
 namespace folly {
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/folly/EvictingCacheMap.h b/folly/EvictingCacheMap.h
index 77517f5a..d94fac02 100644
--- a/folly/EvictingCacheMap.h
+++ b/folly/EvictingCacheMap.h
@@ -20,10 +20,11 @@
 #include <exception>
 #include <functional>
 
-#include <boost/utility.hpp>
 #include <boost/intrusive/list.hpp>
 #include <boost/intrusive/unordered_set.hpp>
 #include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/utility.hpp>
+
 #include <folly/portability/BitsFunctexcept.h>
 
 namespace folly {
diff --git a/folly/FileUtil.h b/folly/FileUtil.h
index d3260f91..c27e249a 100644
--- a/folly/FileUtil.h
+++ b/folly/FileUtil.h
@@ -16,6 +16,12 @@
 
 #pragma once
 
+#include <sys/stat.h>
+#include <sys/types.h>
+
+#include <cassert>
+#include <limits>
+
 #include <folly/Portability.h>
 #include <folly/Range.h>
 #include <folly/ScopeGuard.h>
@@ -23,11 +29,6 @@
 #include <folly/portability/SysUio.h>
 #include <folly/portability/Unistd.h>
 
-#include <cassert>
-#include <limits>
-#include <sys/stat.h>
-#include <sys/types.h>
-
 namespace folly {
 
 /**
diff --git a/folly/FormatArg.h b/folly/FormatArg.h
index 48311e3d..fec6e811 100644
--- a/folly/FormatArg.h
+++ b/folly/FormatArg.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <stdexcept>
+
 #include <folly/Conv.h>
 #include <folly/Likely.h>
 #include <folly/Portability.h>
diff --git a/folly/GroupVarint.h b/folly/GroupVarint.h
index 9652a4d1..8a101d51 100644
--- a/folly/GroupVarint.h
+++ b/folly/GroupVarint.h
@@ -16,6 +16,11 @@
 
 #pragma once
 
+#include <cstdint>
+#include <limits>
+
+#include <glog/logging.h>
+
 #if !defined(__GNUC__) && !defined(_MSC_VER)
 #error GroupVarint.h requires GCC or MSVC
 #endif
@@ -25,13 +30,10 @@
 #if FOLLY_X64 || defined(__i386__) || FOLLY_PPC64 || FOLLY_A64
 #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/portability/Builtins.h>
-#include <glog/logging.h>
 
 #if FOLLY_SSE >= 3
 #include <nmmintrin.h>
diff --git a/folly/IPAddress.h b/folly/IPAddress.h
index bd6906cf..4ed42a98 100644
--- a/folly/IPAddress.h
+++ b/folly/IPAddress.h
@@ -22,10 +22,10 @@
 #include <string>
 #include <utility> // std::pair
 
-#include <folly/Range.h>
 #include <folly/IPAddressException.h>
 #include <folly/IPAddressV4.h>
 #include <folly/IPAddressV6.h>
+#include <folly/Range.h>
 #include <folly/detail/IPAddress.h>
 
 namespace folly {
diff --git a/folly/Lazy.h b/folly/Lazy.h
index 786f51c6..32723bc1 100644
--- a/folly/Lazy.h
+++ b/folly/Lazy.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <utility>
 #include <type_traits>
+#include <utility>
 
 #include <folly/Optional.h>
 
diff --git a/folly/LifoSem.h b/folly/LifoSem.h
index 9c0404fe..aeefdaa1 100644
--- a/folly/LifoSem.h
+++ b/folly/LifoSem.h
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include <string.h>
-#include <stdint.h>
-#include <atomic>
 #include <algorithm>
+#include <atomic>
+#include <cstdint>
+#include <cstring>
 #include <memory>
 #include <system_error>
 
diff --git a/folly/Logging.h b/folly/Logging.h
index 70172706..106aec3a 100644
--- a/folly/Logging.h
+++ b/folly/Logging.h
@@ -18,6 +18,7 @@
 
 #include <atomic>
 #include <chrono>
+
 #include <glog/logging.h>
 
 #ifndef FB_LOG_EVERY_MS
diff --git a/folly/MPMCQueue.h b/folly/MPMCQueue.h
index 0e921060..6ae222da 100644
--- a/folly/MPMCQueue.h
+++ b/folly/MPMCQueue.h
@@ -18,12 +18,13 @@
 
 #include <algorithm>
 #include <atomic>
-#include <assert.h>
-#include <boost/noncopyable.hpp>
+#include <cassert>
+#include <cstring>
 #include <limits>
-#include <string.h>
 #include <type_traits>
 
+#include <boost/noncopyable.hpp>
+
 #include <folly/Traits.h>
 #include <folly/concurrency/CacheLocality.h>
 #include <folly/detail/TurnSequencer.h>
diff --git a/folly/MemoryMapping.h b/folly/MemoryMapping.h
index 14ce382d..c05bad75 100644
--- a/folly/MemoryMapping.h
+++ b/folly/MemoryMapping.h
@@ -16,10 +16,11 @@
 
 #pragma once
 
+#include <boost/noncopyable.hpp>
+#include <glog/logging.h>
+
 #include <folly/File.h>
 #include <folly/Range.h>
-#include <glog/logging.h>
-#include <boost/noncopyable.hpp>
 
 namespace folly {
 
diff --git a/folly/MicroLock.h b/folly/MicroLock.h
index 511d06fa..c358814d 100644
--- a/folly/MicroLock.h
+++ b/folly/MicroLock.h
@@ -16,11 +16,12 @@
 
 #pragma once
 
-#include <assert.h>
+#include <cassert>
 #include <climits>
-#include <stdint.h>
-#include <folly/detail/Futex.h>
+#include <cstdint>
+
 #include <folly/Portability.h>
+#include <folly/detail/Futex.h>
 
 #if defined(__clang__)
 #define NO_SANITIZE_ADDRESS __attribute__((no_sanitize_address))
diff --git a/folly/MicroSpinLock.h b/folly/MicroSpinLock.h
index 0453b355..737ac70e 100644
--- a/folly/MicroSpinLock.h
+++ b/folly/MicroSpinLock.h
@@ -38,16 +38,17 @@
  */
 
 #include <array>
+#include <atomic>
 #include <cinttypes>
-#include <type_traits>
-#include <boost/noncopyable.hpp>
 #include <cstdlib>
 #include <mutex>
-#include <atomic>
+#include <type_traits>
 
+#include <boost/noncopyable.hpp>
 #include <glog/logging.h>
-#include <folly/detail/Sleeper.h>
+
 #include <folly/Portability.h>
+#include <folly/detail/Sleeper.h>
 
 namespace folly {
 
diff --git a/folly/PackedSyncPtr.h b/folly/PackedSyncPtr.h
index e11588e8..692fbf9b 100644
--- a/folly/PackedSyncPtr.h
+++ b/folly/PackedSyncPtr.h
@@ -16,10 +16,15 @@
 
 #pragma once
 
+#include <type_traits>
+
+#include <glog/logging.h>
+
 #include <folly/Portability.h>
+#include <folly/SmallLocks.h>
 
 #if !FOLLY_X64 && !FOLLY_PPC64 && !FOLLY_A64
-# error "PackedSyncPtr is x64, ppc64 or aarch64 specific code."
+#error "PackedSyncPtr is x64, ppc64 or aarch64 specific code."
 #endif
 
 /*
@@ -52,10 +57,6 @@
  * @author Jordan DeLong <delong.j@fb.com>
  */
 
-#include <folly/SmallLocks.h>
-#include <type_traits>
-#include <glog/logging.h>
-
 namespace folly {
 
 template<class T>
diff --git a/folly/Padded.h b/folly/Padded.h
index 93b37ab4..ca499aad 100644
--- a/folly/Padded.h
+++ b/folly/Padded.h
@@ -27,8 +27,8 @@
 
 #include <boost/iterator/iterator_adaptor.hpp>
 
-#include <folly/Portability.h>
 #include <folly/ContainerTraits.h>
+#include <folly/Portability.h>
 
 /**
  * Code that aids in storing data aligned on block (possibly cache-line)
diff --git a/folly/PicoSpinLock.h b/folly/PicoSpinLock.h
index 485050f1..f0a7d12e 100644
--- a/folly/PicoSpinLock.h
+++ b/folly/PicoSpinLock.h
@@ -42,15 +42,16 @@
 #include <atomic>
 #include <cinttypes>
 #include <cstdlib>
-#include <folly/Portability.h>
 #include <mutex>
 #include <type_traits>
 
-#include <folly/detail/Sleeper.h>
 #include <glog/logging.h>
 
+#include <folly/Portability.h>
+#include <folly/detail/Sleeper.h>
+
 #if !FOLLY_X64 && !FOLLY_A64 && !FOLLY_PPC64
-# error "PicoSpinLock.h is currently x64, aarch64 and ppc64 only."
+#error "PicoSpinLock.h is currently x64, aarch64 and ppc64 only."
 #endif
 
 namespace folly {
diff --git a/folly/RWSpinLock.h b/folly/RWSpinLock.h
index cc4f480a..21df0c0d 100644
--- a/folly/RWSpinLock.h
+++ b/folly/RWSpinLock.h
@@ -138,15 +138,13 @@ pthread_rwlock_t Read        728698     24us       101ns     7.28ms     194us
 #include <folly/Portability.h>
 #include <folly/portability/Asm.h>
 
-#if defined(__GNUC__) && \
-  (defined(__i386) || FOLLY_X64 || \
-   defined(ARCH_K8))
-# define RW_SPINLOCK_USE_X86_INTRINSIC_
-# include <x86intrin.h>
+#if defined(__GNUC__) && (defined(__i386) || FOLLY_X64 || defined(ARCH_K8))
+#define RW_SPINLOCK_USE_X86_INTRINSIC_
+#include <x86intrin.h>
 #elif defined(_MSC_VER) && defined(FOLLY_X64)
-# define RW_SPINLOCK_USE_X86_INTRINSIC_
+#define RW_SPINLOCK_USE_X86_INTRINSIC_
 #else
-# undef RW_SPINLOCK_USE_X86_INTRINSIC_
+#undef RW_SPINLOCK_USE_X86_INTRINSIC_
 #endif
 
 // iOS doesn't define _mm_cvtsi64_si128 and friends
diff --git a/folly/Random.cpp b/folly/Random.cpp
index 16f3e8b3..524b9d06 100644
--- a/folly/Random.cpp
+++ b/folly/Random.cpp
@@ -16,10 +16,10 @@
 
 #include <folly/Random.h>
 
+#include <array>
 #include <atomic>
 #include <mutex>
 #include <random>
-#include <array>
 
 #include <folly/CallOnce.h>
 #include <folly/File.h>
@@ -31,7 +31,7 @@
 #include <glog/logging.h>
 
 #ifdef _MSC_VER
-# include <wincrypt.h> // @manual
+#include <wincrypt.h> // @manual
 #endif
 
 namespace folly {
diff --git a/folly/Random.h b/folly/Random.h
index 52f1f17c..0042176b 100644
--- a/folly/Random.h
+++ b/folly/Random.h
@@ -17,9 +17,10 @@
 #pragma once
 #define FOLLY_RANDOM_H_
 
-#include <type_traits>
+#include <cstdint>
 #include <random>
-#include <stdint.h>
+#include <type_traits>
+
 #include <folly/Portability.h>
 
 #if FOLLY_HAVE_EXTRANDOM_SFMT19937
diff --git a/folly/SingletonThreadLocal.h b/folly/SingletonThreadLocal.h
index a4bb4627..d14878bf 100644
--- a/folly/SingletonThreadLocal.h
+++ b/folly/SingletonThreadLocal.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/ThreadLocal.h>
 #include <folly/Singleton.h>
+#include <folly/ThreadLocal.h>
 
 namespace folly {
 
diff --git a/folly/SocketAddress.cpp b/folly/SocketAddress.cpp
index 2d12d787..4858ab50 100644
--- a/folly/SocketAddress.cpp
+++ b/folly/SocketAddress.cpp
@@ -20,18 +20,19 @@
 
 #include <folly/SocketAddress.h>
 
-#include <folly/CppAttributes.h>
-#include <folly/Exception.h>
-#include <folly/Hash.h>
-
-#include <boost/functional/hash.hpp>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
+#include <cerrno>
+#include <cstdio>
+#include <cstring>
 #include <sstream>
 #include <string>
 #include <system_error>
 
+#include <boost/functional/hash.hpp>
+
+#include <folly/CppAttributes.h>
+#include <folly/Exception.h>
+#include <folly/Hash.h>
+
 namespace {
 
 /**
diff --git a/folly/SparseByteSet.h b/folly/SparseByteSet.h
index 04a03eb8..f6393b0a 100644
--- a/folly/SparseByteSet.h
+++ b/folly/SparseByteSet.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <cstdint>
+
 #include <glog/logging.h>
 
 namespace folly {
diff --git a/folly/String-inl.h b/folly/String-inl.h
index 8baf8f85..c28b6e5d 100644
--- a/folly/String-inl.h
+++ b/folly/String-inl.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <stdexcept>
 #include <iterator>
+#include <stdexcept>
 
 #include <folly/CppAttributes.h>
 
diff --git a/folly/String.cpp b/folly/String.cpp
index af86c668..ffc956d6 100644
--- a/folly/String.cpp
+++ b/folly/String.cpp
@@ -16,17 +16,17 @@
 
 #include <folly/String.h>
 
-#include <folly/ScopeGuard.h>
-
+#include <cctype>
 #include <cerrno>
 #include <cstdarg>
 #include <cstring>
-#include <stdexcept>
 #include <iterator>
-#include <cctype>
-#include <string.h>
+#include <stdexcept>
+
 #include <glog/logging.h>
 
+#include <folly/ScopeGuard.h>
+
 namespace folly {
 
 static inline bool is_oddspace(char c) {
diff --git a/folly/String.h b/folly/String.h
index 80d3e232..c57a255b 100644
--- a/folly/String.h
+++ b/folly/String.h
@@ -17,15 +17,15 @@
 #pragma once
 #define FOLLY_STRING_H_
 
+#include <cstdarg>
 #include <exception>
-#include <stdarg.h>
 #include <string>
+#include <unordered_map>
+#include <unordered_set>
 #include <vector>
-#include <boost/type_traits.hpp>
-#include <boost/regex/pending/unicode_iterator.hpp>
 
-#include <unordered_set>
-#include <unordered_map>
+#include <boost/regex/pending/unicode_iterator.hpp>
+#include <boost/type_traits.hpp>
 
 #include <folly/Conv.h>
 #include <folly/ExceptionString.h>
diff --git a/folly/Subprocess.cpp b/folly/Subprocess.cpp
index 52dad435..1c9eade3 100644
--- a/folly/Subprocess.cpp
+++ b/folly/Subprocess.cpp
@@ -25,8 +25,8 @@
 #endif
 #include <fcntl.h>
 
-#include <array>
 #include <algorithm>
+#include <array>
 #include <system_error>
 
 #include <boost/container/flat_set.hpp>
diff --git a/folly/Subprocess.h b/folly/Subprocess.h
index ea2a062a..98f79d28 100644
--- a/folly/Subprocess.h
+++ b/folly/Subprocess.h
@@ -93,8 +93,9 @@
 
 #pragma once
 
-#include <sys/types.h>
 #include <signal.h>
+#include <sys/types.h>
+
 #if __APPLE__
 #include <sys/wait.h>
 #else
@@ -102,8 +103,8 @@
 #endif
 
 #include <exception>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <boost/container/flat_map.hpp>
 
diff --git a/folly/TimeoutQueue.h b/folly/TimeoutQueue.h
index abea2458..a20998b0 100644
--- a/folly/TimeoutQueue.h
+++ b/folly/TimeoutQueue.h
@@ -27,12 +27,13 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <functional>
-#include <boost/multi_index_container.hpp>
+
 #include <boost/multi_index/indexed_by.hpp>
-#include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/member.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+#include <boost/multi_index_container.hpp>
 
 namespace folly {
 
diff --git a/folly/Traits.h b/folly/Traits.h
index cc30fad2..03442bea 100644
--- a/folly/Traits.h
+++ b/folly/Traits.h
@@ -18,10 +18,10 @@
 
 #pragma once
 
-#include <memory>
+#include <functional>
 #include <limits>
+#include <memory>
 #include <type_traits>
-#include <functional>
 
 #include <folly/Portability.h>
 
diff --git a/folly/Uri.cpp b/folly/Uri.cpp
index 03fe3a06..57ddfb42 100644
--- a/folly/Uri.cpp
+++ b/folly/Uri.cpp
@@ -16,7 +16,8 @@
 
 #include <folly/Uri.h>
 
-#include <ctype.h>
+#include <cctype>
+
 #include <boost/regex.hpp>
 
 namespace folly {
diff --git a/folly/build/GenerateFingerprintTables.cpp b/folly/build/GenerateFingerprintTables.cpp
index 3ae3cd64..e8e5b75f 100644
--- a/folly/build/GenerateFingerprintTables.cpp
+++ b/folly/build/GenerateFingerprintTables.cpp
@@ -18,8 +18,8 @@
 #define __STDC_FORMAT_MACROS 1
 #endif
 
-#include <cstdio>
 #include <cinttypes>
+#include <cstdio>
 
 #include <string>
 
diff --git a/folly/detail/AtomicHashUtils.h b/folly/detail/AtomicHashUtils.h
index e9ca9d0b..49331bf3 100644
--- a/folly/detail/AtomicHashUtils.h
+++ b/folly/detail/AtomicHashUtils.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <thread>
+
 #include <folly/portability/Asm.h>
 
 // Some utilities used by AtomicHashArray and AtomicHashMap
diff --git a/folly/detail/AtomicUnorderedMapUtils.h b/folly/detail/AtomicUnorderedMapUtils.h
index 77fa735f..83ef6672 100644
--- a/folly/detail/AtomicUnorderedMapUtils.h
+++ b/folly/detail/AtomicUnorderedMapUtils.h
@@ -1,7 +1,23 @@
+/*
+ * Copyright 2004-present 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.
+ */
+
 #pragma once
 
 #include <atomic>
-#include <stdint.h>
+#include <cstdint>
 
 #include <folly/portability/SysMman.h>
 #include <folly/portability/Unistd.h>
diff --git a/folly/detail/BitIteratorDetail.h b/folly/detail/BitIteratorDetail.h
index 86cd6f53..ee64ffe4 100644
--- a/folly/detail/BitIteratorDetail.h
+++ b/folly/detail/BitIteratorDetail.h
@@ -18,6 +18,7 @@
 
 #include <iterator>
 #include <type_traits>
+
 #include <boost/iterator/iterator_adaptor.hpp>
 
 namespace folly {
diff --git a/folly/detail/DiscriminatedPtrDetail.h b/folly/detail/DiscriminatedPtrDetail.h
index 12ecbe6d..8f0d70b8 100644
--- a/folly/detail/DiscriminatedPtrDetail.h
+++ b/folly/detail/DiscriminatedPtrDetail.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <utility>
 #include <type_traits>
+#include <utility>
 
 namespace folly {
 namespace dptr_detail {
diff --git a/folly/detail/Futex.h b/folly/detail/Futex.h
index bc241192..87550416 100644
--- a/folly/detail/Futex.h
+++ b/folly/detail/Futex.h
@@ -17,9 +17,10 @@
 #pragma once
 
 #include <atomic>
+#include <cassert>
 #include <chrono>
 #include <limits>
-#include <assert.h>
+
 #include <boost/noncopyable.hpp>
 
 #include <folly/portability/Unistd.h>
diff --git a/folly/detail/IPAddress.h b/folly/detail/IPAddress.h
index 28dbfd89..bc13a2ec 100644
--- a/folly/detail/IPAddress.h
+++ b/folly/detail/IPAddress.h
@@ -16,8 +16,10 @@
 
 #pragma once
 
-#include <string>
 #include <sys/types.h>
+
+#include <string>
+
 #include <folly/portability/Sockets.h>
 
 namespace folly { namespace detail {
diff --git a/folly/detail/MemoryIdler.h b/folly/detail/MemoryIdler.h
index f6694fa5..37c72138 100644
--- a/folly/detail/MemoryIdler.h
+++ b/folly/detail/MemoryIdler.h
@@ -18,6 +18,7 @@
 
 #include <atomic>
 #include <chrono>
+
 #include <folly/AtomicStruct.h>
 #include <folly/Hash.h>
 #include <folly/ThreadId.h>
diff --git a/folly/detail/RangeCommon.cpp b/folly/detail/RangeCommon.cpp
index f681aac4..fa78f283 100644
--- a/folly/detail/RangeCommon.cpp
+++ b/folly/detail/RangeCommon.cpp
@@ -17,6 +17,7 @@
 #include <folly/detail/RangeCommon.h>
 
 #include <bitset>
+
 #include <folly/SparseByteSet.h>
 
 namespace folly {
diff --git a/folly/detail/RangeCommon.h b/folly/detail/RangeCommon.h
index 1777fd65..ce5325eb 100644
--- a/folly/detail/RangeCommon.h
+++ b/folly/detail/RangeCommon.h
@@ -18,7 +18,9 @@
 
 #include <algorithm>
 #include <string>
+
 #include <glog/logging.h>
+
 #include <folly/Likely.h>
 
 namespace folly {
diff --git a/folly/detail/RangeSse42.cpp b/folly/detail/RangeSse42.cpp
index fc9a759f..84dcfb85 100644
--- a/folly/detail/RangeSse42.cpp
+++ b/folly/detail/RangeSse42.cpp
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "RangeSse42.h"
+#include <folly/detail/RangeSse42.h>
 
 #include <glog/logging.h>
+
 #include <folly/Portability.h>
 
 //  Essentially, two versions of this file: one with an SSE42 implementation
diff --git a/folly/detail/RangeSse42.h b/folly/detail/RangeSse42.h
index 1ef87b5d..1b74cfd3 100644
--- a/folly/detail/RangeSse42.h
+++ b/folly/detail/RangeSse42.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <cstddef>
+
 #include <folly/detail/RangeCommon.h>
 
 namespace folly {
diff --git a/folly/detail/SlowFingerprint.h b/folly/detail/SlowFingerprint.h
index b0721fde..6dcc9a7a 100644
--- a/folly/detail/SlowFingerprint.h
+++ b/folly/detail/SlowFingerprint.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <folly/Fingerprint.h>
-#include <folly/detail/FingerprintPolynomial.h>
 #include <folly/Range.h>
+#include <folly/detail/FingerprintPolynomial.h>
 
 namespace folly {
 namespace detail {
diff --git a/folly/dynamic-inl.h b/folly/dynamic-inl.h
index 48666de3..7db61c02 100644
--- a/folly/dynamic-inl.h
+++ b/folly/dynamic-inl.h
@@ -17,11 +17,13 @@
 #pragma once
 
 #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>
 
 //////////////////////////////////////////////////////////////////////
 
diff --git a/folly/experimental/Bits.h b/folly/experimental/Bits.h
index 7e1d19b0..d4976720 100644
--- a/folly/experimental/Bits.h
+++ b/folly/experimental/Bits.h
@@ -17,8 +17,9 @@
 #pragma once
 
 #include <cstddef>
-#include <type_traits>
 #include <limits>
+#include <type_traits>
+
 #include <glog/logging.h>
 
 #include <folly/Bits.h>
diff --git a/folly/experimental/DynamicParser-inl.h b/folly/experimental/DynamicParser-inl.h
index 890b324c..106b8f96 100644
--- a/folly/experimental/DynamicParser-inl.h
+++ b/folly/experimental/DynamicParser-inl.h
@@ -24,7 +24,6 @@
  */
 #pragma once
 
-#include <folly/Conv.h>
 #include <boost/function_types/is_member_pointer.hpp>
 #include <boost/function_types/parameter_types.hpp>
 #include <boost/mpl/equal.hpp>
@@ -32,6 +31,8 @@
 #include <boost/mpl/transform.hpp>
 #include <boost/mpl/vector.hpp>
 
+#include <folly/Conv.h>
+
 namespace folly {
 
 // Auto-conversion of key/value based on callback signature, documented in
diff --git a/folly/experimental/DynamicParser.h b/folly/experimental/DynamicParser.h
index e3caf0c9..3994eb64 100644
--- a/folly/experimental/DynamicParser.h
+++ b/folly/experimental/DynamicParser.h
@@ -24,8 +24,8 @@
  */
 #pragma once
 
-#include <folly/dynamic.h>
 #include <folly/ScopeGuard.h>
+#include <folly/dynamic.h>
 
 namespace folly {
 
diff --git a/folly/experimental/JSONSchema.cpp b/folly/experimental/JSONSchema.cpp
index 863f4107..570e2c76 100644
--- a/folly/experimental/JSONSchema.cpp
+++ b/folly/experimental/JSONSchema.cpp
@@ -21,8 +21,8 @@
 #include <folly/Conv.h>
 #include <folly/Memory.h>
 #include <folly/Optional.h>
-#include <folly/String.h>
 #include <folly/Singleton.h>
+#include <folly/String.h>
 #include <folly/json.h>
 
 namespace folly {
diff --git a/folly/experimental/JSONSchema.h b/folly/experimental/JSONSchema.h
index be3c1d67..e11a5a8c 100644
--- a/folly/experimental/JSONSchema.h
+++ b/folly/experimental/JSONSchema.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <folly/ExceptionWrapper.h>
-#include <folly/dynamic.h>
 #include <folly/Range.h>
+#include <folly/dynamic.h>
 
 /**
  * Validation according to the draft v4 standard: http://json-schema.org/
diff --git a/folly/experimental/LockFreeRingBuffer.h b/folly/experimental/LockFreeRingBuffer.h
index 0e32e033..6968c7fe 100644
--- a/folly/experimental/LockFreeRingBuffer.h
+++ b/folly/experimental/LockFreeRingBuffer.h
@@ -17,12 +17,13 @@
 #pragma once
 
 #include <atomic>
-#include <boost/noncopyable.hpp>
 #include <cmath>
+#include <cstring>
 #include <memory>
-#include <string.h>
 #include <type_traits>
 
+#include <boost/noncopyable.hpp>
+
 #include <folly/Portability.h>
 #include <folly/detail/TurnSequencer.h>
 #include <folly/portability/TypeTraits.h>
diff --git a/folly/experimental/NestedCommandLineApp.cpp b/folly/experimental/NestedCommandLineApp.cpp
index 4b376df4..19f86663 100644
--- a/folly/experimental/NestedCommandLineApp.cpp
+++ b/folly/experimental/NestedCommandLineApp.cpp
@@ -17,6 +17,7 @@
 #include <folly/experimental/NestedCommandLineApp.h>
 
 #include <iostream>
+
 #include <folly/FileUtil.h>
 #include <folly/Format.h>
 #include <folly/experimental/io/FsUtil.h>
diff --git a/folly/experimental/StringKeyedCommon.h b/folly/experimental/StringKeyedCommon.h
index e29d2c1b..416874df 100644
--- a/folly/experimental/StringKeyedCommon.h
+++ b/folly/experimental/StringKeyedCommon.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <memory>
+
 #include <folly/Range.h>
 
 namespace folly {
diff --git a/folly/experimental/StringKeyedMap.h b/folly/experimental/StringKeyedMap.h
index d8b822c7..4164cde4 100644
--- a/folly/experimental/StringKeyedMap.h
+++ b/folly/experimental/StringKeyedMap.h
@@ -19,8 +19,9 @@
 #pragma once
 
 #include <initializer_list>
-#include <memory>
 #include <map>
+#include <memory>
+
 #include <folly/Range.h>
 #include <folly/experimental/StringKeyedCommon.h>
 
diff --git a/folly/experimental/StringKeyedSet.h b/folly/experimental/StringKeyedSet.h
index 2b3f8f3e..699124dd 100644
--- a/folly/experimental/StringKeyedSet.h
+++ b/folly/experimental/StringKeyedSet.h
@@ -21,6 +21,7 @@
 #include <initializer_list>
 #include <memory>
 #include <set>
+
 #include <folly/Range.h>
 #include <folly/experimental/StringKeyedCommon.h>
 
diff --git a/folly/experimental/TestUtil.cpp b/folly/experimental/TestUtil.cpp
index d05dafe8..d0f39b94 100644
--- a/folly/experimental/TestUtil.cpp
+++ b/folly/experimental/TestUtil.cpp
@@ -16,10 +16,11 @@
 
 #include <folly/experimental/TestUtil.h>
 
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 
 #include <boost/regex.hpp>
+
 #include <folly/Exception.h>
 #include <folly/File.h>
 #include <folly/FileUtil.h>
diff --git a/folly/experimental/TestUtil.h b/folly/experimental/TestUtil.h
index 1cc9f190..cc110feb 100644
--- a/folly/experimental/TestUtil.h
+++ b/folly/experimental/TestUtil.h
@@ -18,6 +18,7 @@
 
 #include <map>
 #include <string>
+
 #include <folly/Range.h>
 #include <folly/ScopeGuard.h>
 #include <folly/experimental/io/FsUtil.h>
diff --git a/folly/experimental/bser/Dump.cpp b/folly/experimental/bser/Dump.cpp
index 4a8d5b51..461f38ae 100644
--- a/folly/experimental/bser/Dump.cpp
+++ b/folly/experimental/bser/Dump.cpp
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Bser.h"
+
+#include <folly/experimental/bser/Bser.h>
+
 #include <folly/io/Cursor.h>
 
 using namespace folly;
diff --git a/folly/experimental/bser/Load.cpp b/folly/experimental/bser/Load.cpp
index e462ee49..1c210817 100644
--- a/folly/experimental/bser/Load.cpp
+++ b/folly/experimental/bser/Load.cpp
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Bser.h"
-#include <folly/io/Cursor.h>
+
+#include <folly/experimental/bser/Bser.h>
+
 #include <folly/String.h>
+#include <folly/io/Cursor.h>
 
 using namespace folly;
 using folly::io::Cursor;
diff --git a/folly/experimental/bser/test/BserTest.cpp b/folly/experimental/bser/test/BserTest.cpp
index fec32c3e..5f03dd81 100644
--- a/folly/experimental/bser/test/BserTest.cpp
+++ b/folly/experimental/bser/test/BserTest.cpp
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <folly/experimental/bser/Bser.h>
+
 #include <folly/String.h>
 #include <folly/portability/GTest.h>
 
diff --git a/folly/experimental/hazptr/test/HazptrTest.cpp b/folly/experimental/hazptr/test/HazptrTest.cpp
index a669db8b..d8ca18da 100644
--- a/folly/experimental/hazptr/test/HazptrTest.cpp
+++ b/folly/experimental/hazptr/test/HazptrTest.cpp
@@ -17,13 +17,13 @@
 #define HAZPTR_STATS true
 #define HAZPTR_SCAN_THRESHOLD 10
 
-#include <folly/experimental/hazptr/test/HazptrUse1.h>
-#include <folly/experimental/hazptr/test/HazptrUse2.h>
+#include <folly/experimental/hazptr/debug.h>
 #include <folly/experimental/hazptr/example/LockFreeLIFO.h>
 #include <folly/experimental/hazptr/example/SWMRList.h>
 #include <folly/experimental/hazptr/example/WideCAS.h>
-#include <folly/experimental/hazptr/debug.h>
 #include <folly/experimental/hazptr/hazptr.h>
+#include <folly/experimental/hazptr/test/HazptrUse1.h>
+#include <folly/experimental/hazptr/test/HazptrUse2.h>
 
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
diff --git a/folly/experimental/io/AsyncIO.h b/folly/experimental/io/AsyncIO.h
index 3af437a0..6dfb8e6b 100644
--- a/folly/experimental/io/AsyncIO.h
+++ b/folly/experimental/io/AsyncIO.h
@@ -17,7 +17,6 @@
 #pragma once
 
 #include <sys/types.h>
-#include <libaio.h>
 
 #include <atomic>
 #include <cstdint>
@@ -29,6 +28,7 @@
 #include <vector>
 
 #include <boost/noncopyable.hpp>
+#include <libaio.h>
 
 #include <folly/Portability.h>
 #include <folly/Range.h>
diff --git a/folly/experimental/io/HugePages.cpp b/folly/experimental/io/HugePages.cpp
index ad15d359..fbbd7708 100644
--- a/folly/experimental/io/HugePages.cpp
+++ b/folly/experimental/io/HugePages.cpp
@@ -16,9 +16,9 @@
 
 #include <folly/experimental/io/HugePages.h>
 
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <fcntl.h>
 
 #include <cctype>
 #include <cstring>
diff --git a/folly/experimental/io/test/AsyncIOTest.cpp b/folly/experimental/io/test/AsyncIOTest.cpp
index d7b32732..05644c71 100644
--- a/folly/experimental/io/test/AsyncIOTest.cpp
+++ b/folly/experimental/io/test/AsyncIOTest.cpp
@@ -16,12 +16,12 @@
 
 #include <folly/experimental/io/AsyncIO.h>
 
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <fcntl.h>
 
-#include <cstdlib>
 #include <cstdio>
+#include <cstdlib>
 #include <memory>
 #include <random>
 #include <thread>
@@ -29,9 +29,9 @@
 
 #include <glog/logging.h>
 
-#include <folly/experimental/io/FsUtil.h>
 #include <folly/ScopeGuard.h>
 #include <folly/String.h>
+#include <folly/experimental/io/FsUtil.h>
 #include <folly/portability/GTest.h>
 #include <folly/portability/Sockets.h>
 
diff --git a/folly/experimental/symbolizer/Dwarf.h b/folly/experimental/symbolizer/Dwarf.h
index 8aec70cd..aae1b3a5 100644
--- a/folly/experimental/symbolizer/Dwarf.h
+++ b/folly/experimental/symbolizer/Dwarf.h
@@ -20,8 +20,8 @@
 
 #include <boost/variant.hpp>
 
-#include <folly/experimental/symbolizer/Elf.h>
 #include <folly/Range.h>
+#include <folly/experimental/symbolizer/Elf.h>
 
 namespace folly {
 namespace symbolizer {
diff --git a/folly/experimental/symbolizer/Elf.h b/folly/experimental/symbolizer/Elf.h
index b16c8718..f0a0bd7b 100644
--- a/folly/experimental/symbolizer/Elf.h
+++ b/folly/experimental/symbolizer/Elf.h
@@ -19,10 +19,10 @@
 #pragma once
 #define FOLLY_EXPERIMENTAL_SYMBOLIZER_ELF_H_
 
-#include <stdio.h>
 #include <elf.h>
-#include <link.h>  // For ElfW()
+#include <link.h> // For ElfW()
 
+#include <cstdio>
 #include <stdexcept>
 #include <system_error>
 
diff --git a/folly/experimental/symbolizer/ElfCache.h b/folly/experimental/symbolizer/ElfCache.h
index 135b6e9a..af4f4c44 100644
--- a/folly/experimental/symbolizer/ElfCache.h
+++ b/folly/experimental/symbolizer/ElfCache.h
@@ -16,17 +16,17 @@
 
 #pragma once
 
+#include <climits> // for PATH_MAX
 #include <cstring>
-#include <limits.h>  // for PATH_MAX
 #include <memory>
 #include <mutex>
 #include <string>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
-#include <boost/operators.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/intrusive/list.hpp>
+#include <boost/operators.hpp>
 #include <glog/logging.h>
 
 #include <folly/Hash.h>
diff --git a/folly/experimental/symbolizer/Symbolizer.cpp b/folly/experimental/symbolizer/Symbolizer.cpp
index 56d8e2ac..abfc64cf 100644
--- a/folly/experimental/symbolizer/Symbolizer.cpp
+++ b/folly/experimental/symbolizer/Symbolizer.cpp
@@ -16,11 +16,12 @@
 
 #include <folly/experimental/symbolizer/Symbolizer.h>
 
+#include <link.h>
+
+#include <climits>
 #include <cstdio>
 #include <cstdlib>
 #include <iostream>
-#include <limits.h>
-#include <link.h>
 
 #ifdef __GNUC__
 #include <ext/stdio_filebuf.h>
diff --git a/folly/experimental/symbolizer/Symbolizer.h b/folly/experimental/symbolizer/Symbolizer.h
index 772b11d0..73e7dfdd 100644
--- a/folly/experimental/symbolizer/Symbolizer.h
+++ b/folly/experimental/symbolizer/Symbolizer.h
@@ -24,11 +24,11 @@
 #include <folly/FBString.h>
 #include <folly/Range.h>
 #include <folly/String.h>
-#include <folly/io/IOBuf.h>
+#include <folly/experimental/symbolizer/Dwarf.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/io/IOBuf.h>
 
 namespace folly {
 namespace symbolizer {
diff --git a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
index c2ae9e95..56c216fd 100644
--- a/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
+++ b/folly/experimental/symbolizer/test/SignalHandlerTest.cpp
@@ -17,9 +17,9 @@
 #include <folly/experimental/symbolizer/test/SignalHandlerTest.h>
 #include <folly/experimental/symbolizer/SignalHandler.h>
 
+#include <folly/CPortability.h>
 #include <folly/FileUtil.h>
 #include <folly/Range.h>
-#include <folly/CPortability.h>
 #include <folly/portability/GTest.h>
 
 namespace folly { namespace symbolizer { namespace test {
diff --git a/folly/experimental/test/BitsBenchmark.cpp b/folly/experimental/test/BitsBenchmark.cpp
index a0263388..7ece8e3c 100644
--- a/folly/experimental/test/BitsBenchmark.cpp
+++ b/folly/experimental/test/BitsBenchmark.cpp
@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <atomic>
-#include <glog/logging.h>
-#include <random>
 #include <memory>
+#include <random>
+
+#include <glog/logging.h>
 
 #include <folly/Benchmark.h>
 #include <folly/experimental/Bits.h>
diff --git a/folly/experimental/test/CodingTestUtils.h b/folly/experimental/test/CodingTestUtils.h
index f7c3dfe3..ffbfd53e 100644
--- a/folly/experimental/test/CodingTestUtils.h
+++ b/folly/experimental/test/CodingTestUtils.h
@@ -21,8 +21,9 @@
 #include <limits>
 #include <random>
 #include <string>
-#include <vector>
 #include <unordered_set>
+#include <vector>
+
 #include <glog/logging.h>
 
 #include <folly/portability/GTest.h>
diff --git a/folly/experimental/test/EventCountTest.cpp b/folly/experimental/test/EventCountTest.cpp
index 17da4644..80fdcc47 100644
--- a/folly/experimental/test/EventCountTest.cpp
+++ b/folly/experimental/test/EventCountTest.cpp
@@ -21,6 +21,7 @@
 #include <random>
 #include <thread>
 #include <vector>
+
 #include <glog/logging.h>
 
 #include <folly/Random.h>
diff --git a/folly/experimental/test/FlatCombiningPriorityQueueTest.cpp b/folly/experimental/test/FlatCombiningPriorityQueueTest.cpp
index 0085f88c..cb21b809 100644
--- a/folly/experimental/test/FlatCombiningPriorityQueueTest.cpp
+++ b/folly/experimental/test/FlatCombiningPriorityQueueTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <folly/experimental/FlatCombiningPriorityQueue.h>
 #include <folly/Benchmark.h>
+#include <folly/experimental/FlatCombiningPriorityQueue.h>
 #include <folly/portability/GTest.h>
 #include <glog/logging.h>
 
diff --git a/folly/experimental/test/LockFreeRingBufferTest.cpp b/folly/experimental/test/LockFreeRingBufferTest.cpp
index dd1567fd..7f48b9cf 100644
--- a/folly/experimental/test/LockFreeRingBufferTest.cpp
+++ b/folly/experimental/test/LockFreeRingBufferTest.cpp
@@ -18,8 +18,8 @@
 #include <thread>
 
 #include <folly/experimental/LockFreeRingBuffer.h>
-#include <folly/test/DeterministicSchedule.h>
 #include <folly/portability/GTest.h>
+#include <folly/test/DeterministicSchedule.h>
 
 namespace folly {
 
diff --git a/folly/experimental/test/NestedCommandLineAppExample.cpp b/folly/experimental/test/NestedCommandLineAppExample.cpp
index e1d7f430..42ae2b12 100644
--- a/folly/experimental/test/NestedCommandLineAppExample.cpp
+++ b/folly/experimental/test/NestedCommandLineAppExample.cpp
@@ -19,8 +19,8 @@
 // Implements two commands: "cat" and "echo", which behave similarly to their
 // Unix homonyms.
 
-#include <folly/String.h>
 #include <folly/ScopeGuard.h>
+#include <folly/String.h>
 #include <folly/experimental/NestedCommandLineApp.h>
 #include <folly/experimental/ProgramOptions.h>
 
diff --git a/folly/experimental/test/ProgramOptionsTestHelper.cpp b/folly/experimental/test/ProgramOptionsTestHelper.cpp
index 172343ef..12691b87 100644
--- a/folly/experimental/test/ProgramOptionsTestHelper.cpp
+++ b/folly/experimental/test/ProgramOptionsTestHelper.cpp
@@ -15,9 +15,11 @@
  */
 
 #include <iostream>
+
+#include <glog/logging.h>
+
 #include <folly/Conv.h>
 #include <folly/experimental/ProgramOptions.h>
-#include <glog/logging.h>
 
 DEFINE_bool(flag_bool_true, true, "Bool with true default value");
 DEFINE_bool(flag_bool_false, false, "Bool with false default value");
diff --git a/folly/experimental/test/ReadMostlySharedPtrTest.cpp b/folly/experimental/test/ReadMostlySharedPtrTest.cpp
index ba85eb0b..08996115 100644
--- a/folly/experimental/test/ReadMostlySharedPtrTest.cpp
+++ b/folly/experimental/test/ReadMostlySharedPtrTest.cpp
@@ -16,12 +16,12 @@
 /* -*- Mode: C++; tab-width: 2; c-basic-offset: 2; indent-tabs-mode: nil -*- */
 
 #include <atomic>
-#include <thread>
-#include <mutex>
-#include <folly/Memory.h>
 #include <condition_variable>
+#include <mutex>
+#include <thread>
 
 #include <folly/Baton.h>
+#include <folly/Memory.h>
 #include <folly/experimental/RCURefCount.h>
 #include <folly/experimental/ReadMostlySharedPtr.h>
 #include <folly/portability/GTest.h>
diff --git a/folly/futures/Future-inl.h b/folly/futures/Future-inl.h
index 84bf33a1..df837c54 100644
--- a/folly/futures/Future-inl.h
+++ b/folly/futures/Future-inl.h
@@ -21,11 +21,12 @@
 #include <chrono>
 #include <random>
 #include <thread>
+
 #include <folly/Baton.h>
 #include <folly/Optional.h>
 #include <folly/Random.h>
-#include <folly/futures/detail/Core.h>
 #include <folly/futures/Timekeeper.h>
+#include <folly/futures/detail/Core.h>
 
 #if FOLLY_MOBILE || defined(__APPLE__)
 #define FOLLY_FUTURE_USING_FIBER 0
diff --git a/folly/futures/Future.cpp b/folly/futures/Future.cpp
index 6fdaa252..e53331b4 100644
--- a/folly/futures/Future.cpp
+++ b/folly/futures/Future.cpp
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <folly/futures/Future.h>
-#include <folly/futures/ThreadWheelTimekeeper.h>
 #include <folly/Likely.h>
+#include <folly/futures/ThreadWheelTimekeeper.h>
 
 namespace folly {
 
diff --git a/folly/futures/ManualExecutor.h b/folly/futures/ManualExecutor.h
index 76847e2c..689111eb 100644
--- a/folly/futures/ManualExecutor.h
+++ b/folly/futures/ManualExecutor.h
@@ -15,13 +15,15 @@
  */
 
 #pragma once
-#include <folly/LifoSem.h>
-#include <folly/futures/DrivableExecutor.h>
-#include <folly/futures/ScheduledExecutor.h>
+
+#include <cstdio>
 #include <memory>
 #include <mutex>
 #include <queue>
-#include <cstdio>
+
+#include <folly/LifoSem.h>
+#include <folly/futures/DrivableExecutor.h>
+#include <folly/futures/ScheduledExecutor.h>
 
 namespace folly {
   /// A ManualExecutor only does work when you turn the crank, by calling
diff --git a/folly/futures/SharedPromise.h b/folly/futures/SharedPromise.h
index 51a4a179..2e466b1a 100644
--- a/folly/futures/SharedPromise.h
+++ b/folly/futures/SharedPromise.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/futures/Promise.h>
 #include <folly/Portability.h>
+#include <folly/futures/Promise.h>
 
 namespace folly {
 
diff --git a/folly/futures/Timekeeper.h b/folly/futures/Timekeeper.h
index 4214229a..f5223f43 100644
--- a/folly/futures/Timekeeper.h
+++ b/folly/futures/Timekeeper.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/futures/detail/Types.h>
 #include <folly/Unit.h>
+#include <folly/futures/detail/Types.h>
 
 namespace folly {
 
diff --git a/folly/futures/detail/FSM.h b/folly/futures/detail/FSM.h
index fc3bb117..a9076adf 100644
--- a/folly/futures/detail/FSM.h
+++ b/folly/futures/detail/FSM.h
@@ -18,6 +18,7 @@
 
 #include <atomic>
 #include <mutex>
+
 #include <folly/MicroSpinLock.h>
 
 namespace folly { namespace detail {
diff --git a/folly/futures/exercises/01-Values.cpp b/folly/futures/exercises/01-Values.cpp
index 3f6ea12b..97b4af1b 100644
--- a/folly/futures/exercises/01-Values.cpp
+++ b/folly/futures/exercises/01-Values.cpp
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "Koan.h"
+
 #include <folly/futures/Future.h>
 
+#include "Koan.h"
+
 using folly::Future;
 using folly::makeFuture;
 
diff --git a/folly/futures/exercises/Koan.h b/folly/futures/exercises/Koan.h
index 95523b2a..8b0f9133 100644
--- a/folly/futures/exercises/Koan.h
+++ b/folly/futures/exercises/Koan.h
@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #pragma once
-#include <folly/Portability.h>
-#include <gtest/gtest.h>
+
 #include <gflags/gflags.h>
+#include <gtest/gtest.h>
+
+#include <folly/Portability.h>
diff --git a/folly/futures/test/CollectTest.cpp b/folly/futures/test/CollectTest.cpp
index 908fa3cd..c01fadf4 100644
--- a/folly/futures/test/CollectTest.cpp
+++ b/folly/futures/test/CollectTest.cpp
@@ -18,10 +18,10 @@
 
 #include <boost/thread/barrier.hpp>
 
-#include <folly/futures/Future.h>
 #include <folly/Random.h>
-#include <folly/small_vector.h>
+#include <folly/futures/Future.h>
 #include <folly/portability/GTest.h>
+#include <folly/small_vector.h>
 
 using namespace folly;
 
diff --git a/folly/futures/test/ExecutorTest.cpp b/folly/futures/test/ExecutorTest.cpp
index d21f1079..d4b24e09 100644
--- a/folly/futures/test/ExecutorTest.cpp
+++ b/folly/futures/test/ExecutorTest.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
+#include <folly/Baton.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/InlineExecutor.h>
 #include <folly/futures/ManualExecutor.h>
 #include <folly/futures/QueuedImmediateExecutor.h>
-#include <folly/Baton.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;
diff --git a/folly/futures/test/FutureTest.cpp b/folly/futures/test/FutureTest.cpp
index 4dd3f2dc..6db394d2 100644
--- a/folly/futures/test/FutureTest.cpp
+++ b/folly/futures/test/FutureTest.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <folly/futures/Future.h>
-#include <folly/Unit.h>
-#include <folly/Memory.h>
+#include <folly/Baton.h>
 #include <folly/Executor.h>
+#include <folly/Memory.h>
+#include <folly/Unit.h>
 #include <folly/dynamic.h>
-#include <folly/Baton.h>
+#include <folly/futures/Future.h>
 #include <folly/portability/GTest.h>
 
 #include <algorithm>
diff --git a/folly/futures/test/HeaderCompileTest.cpp b/folly/futures/test/HeaderCompileTest.cpp
index fd81b74e..927905fd 100644
--- a/folly/futures/test/HeaderCompileTest.cpp
+++ b/folly/futures/test/HeaderCompileTest.cpp
@@ -17,8 +17,8 @@
 // amazing what things can go wrong if you include things in an unexpected
 // order.
 #include <folly/Try.h>
-#include <folly/futures/Promise.h>
 #include <folly/futures/Future.h>
+#include <folly/futures/Promise.h>
 #include <folly/portability/GTest.h>
 
 TEST(Basic, compiles) {
diff --git a/folly/futures/test/InterruptTest.cpp b/folly/futures/test/InterruptTest.cpp
index 7e8f3298..7c51bb1e 100644
--- a/folly/futures/test/InterruptTest.cpp
+++ b/folly/futures/test/InterruptTest.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include <folly/Baton.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/Promise.h>
-#include <folly/Baton.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;
diff --git a/folly/futures/test/ViaTest.cpp b/folly/futures/test/ViaTest.cpp
index f843a029..198c4f93 100644
--- a/folly/futures/test/ViaTest.cpp
+++ b/folly/futures/test/ViaTest.cpp
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
+#include <thread>
+
+#include <folly/Baton.h>
+#include <folly/MPMCQueue.h>
+#include <folly/futures/DrivableExecutor.h>
 #include <folly/futures/Future.h>
 #include <folly/futures/InlineExecutor.h>
 #include <folly/futures/ManualExecutor.h>
-#include <folly/futures/DrivableExecutor.h>
-#include <folly/Baton.h>
-#include <folly/MPMCQueue.h>
 #include <folly/portability/GTest.h>
 
-#include <thread>
-
 using namespace folly;
 
 struct ManualWaiter : public DrivableExecutor {
diff --git a/folly/futures/test/WaitTest.cpp b/folly/futures/test/WaitTest.cpp
index 85ff6174..57e4e172 100644
--- a/folly/futures/test/WaitTest.cpp
+++ b/folly/futures/test/WaitTest.cpp
@@ -16,9 +16,9 @@
 
 #include <queue>
 
+#include <folly/Baton.h>
 #include <folly/futures/Future.h>
 #include <folly/io/async/EventBase.h>
-#include <folly/Baton.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;
diff --git a/folly/gen/test/BaseBenchmark.cpp b/folly/gen/test/BaseBenchmark.cpp
index 07324b3e..a059898f 100644
--- a/folly/gen/test/BaseBenchmark.cpp
+++ b/folly/gen/test/BaseBenchmark.cpp
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <atomic>
+
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>
diff --git a/folly/gen/test/CombineTest.cpp b/folly/gen/test/CombineTest.cpp
index 42c90405..da21cdcb 100644
--- a/folly/gen/test/CombineTest.cpp
+++ b/folly/gen/test/CombineTest.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 #include <string>
-#include <vector>
 #include <tuple>
+#include <vector>
 
-#include <folly/Range.h>
 #include <folly/FBVector.h>
+#include <folly/Range.h>
 #include <folly/gen/Base.h>
 #include <folly/gen/Combine.h>
 #include <folly/portability/GTest.h>
diff --git a/folly/gen/test/FileBenchmark.cpp b/folly/gen/test/FileBenchmark.cpp
index 64912aca..74693c51 100644
--- a/folly/gen/test/FileBenchmark.cpp
+++ b/folly/gen/test/FileBenchmark.cpp
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <thread>
+
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>
diff --git a/folly/gen/test/ParallelBenchmark.cpp b/folly/gen/test/ParallelBenchmark.cpp
index 28fdc7eb..9bced1ee 100644
--- a/folly/gen/test/ParallelBenchmark.cpp
+++ b/folly/gen/test/ParallelBenchmark.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include <glog/logging.h>
-#include <iostream>
 #include <array>
-#include <vector>
 #include <future>
+#include <iostream>
+#include <vector>
+
+#include <glog/logging.h>
 
 #include <folly/gen/Base.h>
 #include <folly/gen/Parallel.h>
diff --git a/folly/gen/test/ParallelMapBenchmark.cpp b/folly/gen/test/ParallelMapBenchmark.cpp
index 0e2e7f74..89e9f06d 100644
--- a/folly/gen/test/ParallelMapBenchmark.cpp
+++ b/folly/gen/test/ParallelMapBenchmark.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <atomic>
 #include <algorithm>
+#include <atomic>
 #include <thread>
 #include <vector>
 
diff --git a/folly/gen/test/ParallelTest.cpp b/folly/gen/test/ParallelTest.cpp
index 36bc4c96..b90202c6 100644
--- a/folly/gen/test/ParallelTest.cpp
+++ b/folly/gen/test/ParallelTest.cpp
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include <glog/logging.h>
-
-#include <iostream>
 #include <array>
+#include <iostream>
 #include <vector>
 
+#include <glog/logging.h>
+
 #include <folly/gen/Base.h>
 #include <folly/gen/Parallel.h>
 #include <folly/portability/GTest.h>
diff --git a/folly/gen/test/StringBenchmark.cpp b/folly/gen/test/StringBenchmark.cpp
index c6de1ed4..df7dcec7 100644
--- a/folly/gen/test/StringBenchmark.cpp
+++ b/folly/gen/test/StringBenchmark.cpp
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <atomic>
+
 #include <glog/logging.h>
 
 #include <folly/Benchmark.h>
diff --git a/folly/io/Compression.cpp b/folly/io/Compression.cpp
index 98f332b8..cfa53181 100644
--- a/folly/io/Compression.cpp
+++ b/folly/io/Compression.cpp
@@ -27,8 +27,8 @@
 #include <glog/logging.h>
 
 #if FOLLY_HAVE_LIBSNAPPY
-#include <snappy.h>
 #include <snappy-sinksource.h>
+#include <snappy.h>
 #endif
 
 #if FOLLY_HAVE_LIBZ
diff --git a/folly/io/Cursor.cpp b/folly/io/Cursor.cpp
index c51ce6cc..cd7807c1 100644
--- a/folly/io/Cursor.cpp
+++ b/folly/io/Cursor.cpp
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <folly/io/Cursor.h>
 
 #include <cstdio>
+
 #include <folly/ScopeGuard.h>
 
 namespace folly {
diff --git a/folly/io/Cursor.h b/folly/io/Cursor.h
index 4d61b4f5..ac5ec91f 100644
--- a/folly/io/Cursor.h
+++ b/folly/io/Cursor.h
@@ -16,12 +16,12 @@
 
 #pragma once
 
-#include <assert.h>
+#include <cassert>
 #include <cstdarg>
+#include <cstring>
+#include <memory>
 #include <stdexcept>
-#include <string.h>
 #include <type_traits>
-#include <memory>
 
 #include <folly/Bits.h>
 #include <folly/Likely.h>
diff --git a/folly/io/IOBuf.cpp b/folly/io/IOBuf.cpp
index 56986061..a71ff32e 100644
--- a/folly/io/IOBuf.cpp
+++ b/folly/io/IOBuf.cpp
@@ -20,6 +20,11 @@
 
 #include <folly/io/IOBuf.h>
 
+#include <cassert>
+#include <cstdint>
+#include <cstdlib>
+#include <stdexcept>
+
 #include <folly/Conv.h>
 #include <folly/Likely.h>
 #include <folly/Malloc.h>
@@ -28,11 +33,6 @@
 #include <folly/SpookyHashV2.h>
 #include <folly/io/Cursor.h>
 
-#include <stdexcept>
-#include <assert.h>
-#include <stdint.h>
-#include <stdlib.h>
-
 using std::unique_ptr;
 
 namespace {
diff --git a/folly/io/IOBuf.h b/folly/io/IOBuf.h
index 238c4ec6..3e68f473 100644
--- a/folly/io/IOBuf.h
+++ b/folly/io/IOBuf.h
@@ -22,8 +22,8 @@
 #include <cinttypes>
 #include <cstddef>
 #include <cstring>
-#include <memory>
 #include <limits>
+#include <memory>
 #include <type_traits>
 
 #include <boost/iterator/iterator_facade.hpp>
diff --git a/folly/io/RecordIO.h b/folly/io/RecordIO.h
index 0acb4a20..856e329f 100644
--- a/folly/io/RecordIO.h
+++ b/folly/io/RecordIO.h
@@ -31,8 +31,8 @@
 #include <mutex>
 
 #include <folly/File.h>
-#include <folly/Range.h>
 #include <folly/MemoryMapping.h>
+#include <folly/Range.h>
 #include <folly/io/IOBuf.h>
 
 namespace folly {
diff --git a/folly/io/async/AsyncPipe.h b/folly/io/async/AsyncPipe.h
index 7a4ece3d..c98206e5 100644
--- a/folly/io/async/AsyncPipe.h
+++ b/folly/io/async/AsyncPipe.h
@@ -13,16 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#pragma once
 
-#include <folly/io/async/AsyncTransport.h>
-#include <folly/io/async/EventHandler.h>
-#include <folly/io/async/DelayedDestruction.h>
-#include <folly/io/IOBufQueue.h>
+#pragma once
 
 #include <list>
 #include <system_error>
 
+#include <folly/io/IOBufQueue.h>
+#include <folly/io/async/AsyncTransport.h>
+#include <folly/io/async/DelayedDestruction.h>
+#include <folly/io/async/EventHandler.h>
+
 namespace folly {
 
 class AsyncSocketException;
diff --git a/folly/io/async/AsyncSSLSocket.h b/folly/io/async/AsyncSSLSocket.h
index 474225c0..33cfb62b 100644
--- a/folly/io/async/AsyncSSLSocket.h
+++ b/folly/io/async/AsyncSSLSocket.h
@@ -18,22 +18,21 @@
 
 #include <iomanip>
 
+#include <folly/Bits.h>
 #include <folly/Optional.h>
 #include <folly/String.h>
+#include <folly/io/Cursor.h>
+#include <folly/io/IOBuf.h>
 #include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/AsyncTimeout.h>
 #include <folly/io/async/SSLContext.h>
 #include <folly/io/async/TimeoutManager.h>
-#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/io/async/ssl/OpenSSLUtils.h>
 #include <folly/io/async/ssl/SSLErrors.h>
 #include <folly/io/async/ssl/TLSDefinitions.h>
-
-#include <folly/Bits.h>
-#include <folly/io/IOBuf.h>
-#include <folly/io/Cursor.h>
 #include <folly/portability/OpenSSL.h>
 #include <folly/portability/Sockets.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 
 namespace folly {
 
diff --git a/folly/io/async/AsyncSocket.h b/folly/io/async/AsyncSocket.h
index 6462f115..09363a3c 100644
--- a/folly/io/async/AsyncSocket.h
+++ b/folly/io/async/AsyncSocket.h
@@ -31,8 +31,8 @@
 #include <sys/types.h>
 
 #include <chrono>
-#include <memory>
 #include <map>
+#include <memory>
 
 namespace folly {
 
diff --git a/folly/io/async/AsyncTransport.h b/folly/io/async/AsyncTransport.h
index 7af32f26..337fba96 100644
--- a/folly/io/async/AsyncTransport.h
+++ b/folly/io/async/AsyncTransport.h
@@ -22,9 +22,9 @@
 #include <folly/io/async/AsyncSocketBase.h>
 #include <folly/io/async/DelayedDestruction.h>
 #include <folly/io/async/EventBase.h>
-#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/portability/OpenSSL.h>
 #include <folly/portability/SysUio.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 
 constexpr bool kOpenSslModeMoveBufferOwnership =
 #ifdef SSL_MODE_MOVE_BUFFER_OWNERSHIP
diff --git a/folly/io/async/AsyncUDPServerSocket.h b/folly/io/async/AsyncUDPServerSocket.h
index 86586580..f712dd00 100644
--- a/folly/io/async/AsyncUDPServerSocket.h
+++ b/folly/io/async/AsyncUDPServerSocket.h
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <folly/io/IOBufQueue.h>
 #include <folly/Memory.h>
+#include <folly/io/IOBufQueue.h>
 #include <folly/io/async/AsyncUDPSocket.h>
 #include <folly/io/async/EventBase.h>
 
diff --git a/folly/io/async/AsyncUDPSocket.cpp b/folly/io/async/AsyncUDPSocket.cpp
index 43c79c21..54ca73a2 100644
--- a/folly/io/async/AsyncUDPSocket.cpp
+++ b/folly/io/async/AsyncUDPSocket.cpp
@@ -16,8 +16,8 @@
 
 #include <folly/io/async/AsyncUDPSocket.h>
 
-#include <folly/io/async/EventBase.h>
 #include <folly/Likely.h>
+#include <folly/io/async/EventBase.h>
 #include <folly/portability/Fcntl.h>
 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>
diff --git a/folly/io/async/AsyncUDPSocket.h b/folly/io/async/AsyncUDPSocket.h
index 4a5a7382..d327c1d6 100644
--- a/folly/io/async/AsyncUDPSocket.h
+++ b/folly/io/async/AsyncUDPSocket.h
@@ -16,15 +16,15 @@
 
 #pragma once
 
-#include <folly/io/IOBuf.h>
+#include <memory>
+
 #include <folly/ScopeGuard.h>
-#include <folly/io/async/AsyncSocketException.h>
+#include <folly/SocketAddress.h>
+#include <folly/io/IOBuf.h>
 #include <folly/io/async/AsyncSocketBase.h>
-#include <folly/io/async/EventHandler.h>
+#include <folly/io/async/AsyncSocketException.h>
 #include <folly/io/async/EventBase.h>
-#include <folly/SocketAddress.h>
-
-#include <memory>
+#include <folly/io/async/EventHandler.h>
 
 namespace folly {
 
diff --git a/folly/io/async/EventBase.h b/folly/io/async/EventBase.h
index 0ee54f57..2982a646 100644
--- a/folly/io/async/EventBase.h
+++ b/folly/io/async/EventBase.h
@@ -17,11 +17,11 @@
 #pragma once
 
 #include <atomic>
+#include <cerrno>
+#include <cmath>
 #include <cstdlib>
-#include <errno.h>
 #include <functional>
 #include <list>
-#include <math.h>
 #include <memory>
 #include <mutex>
 #include <queue>
@@ -33,6 +33,7 @@
 
 #include <boost/intrusive/list.hpp>
 #include <boost/utility.hpp>
+#include <glog/logging.h>
 
 #include <folly/CallOnce.h>
 #include <folly/Executor.h>
@@ -46,7 +47,6 @@
 #include <folly/io/async/Request.h>
 #include <folly/io/async/TimeoutManager.h>
 #include <folly/portability/Event.h>
-#include <glog/logging.h>
 
 
 namespace folly {
diff --git a/folly/io/async/EventBaseManager.h b/folly/io/async/EventBaseManager.h
index 5c2ba116..cfcafd83 100644
--- a/folly/io/async/EventBaseManager.h
+++ b/folly/io/async/EventBaseManager.h
@@ -16,10 +16,11 @@
 
 #pragma once
 
+#include <list>
+#include <set>
+
 #include <folly/ThreadLocal.h>
 #include <folly/io/async/EventBase.h>
-#include <set>
-#include <list>
 
 namespace folly {
 
diff --git a/folly/io/async/EventFDWrapper.h b/folly/io/async/EventFDWrapper.h
index cd985f8e..994a7186 100644
--- a/folly/io/async/EventFDWrapper.h
+++ b/folly/io/async/EventFDWrapper.h
@@ -26,7 +26,7 @@
 #endif
 
 #ifdef FOLLY_HAVE_FEATURES_H
-# include <features.h>
+#include <features.h>
 #endif
 
 #if defined(__GLIBC__) && !defined(__APPLE__)
@@ -40,9 +40,9 @@
 #include <sys/eventfd.h>
 #else /* !def FOLLY_GLIBC_2_9 */
 
+#include <fcntl.h>
 #include <sys/syscall.h>
 #include <unistd.h>
-#include <fcntl.h>
 
 // Use existing __NR_eventfd2 if already defined
 // Values from the Linux kernel source:
diff --git a/folly/io/async/EventHandler.h b/folly/io/async/EventHandler.h
index 0d3e5d41..80c405e5 100644
--- a/folly/io/async/EventHandler.h
+++ b/folly/io/async/EventHandler.h
@@ -16,11 +16,13 @@
 
 #pragma once
 
+#include <cstddef>
+
+#include <boost/noncopyable.hpp>
 #include <glog/logging.h>
+
 #include <folly/io/async/EventUtil.h>
 #include <folly/portability/Event.h>
-#include <boost/noncopyable.hpp>
-#include <stddef.h>
 
 namespace folly {
 
diff --git a/folly/io/async/NotificationQueue.h b/folly/io/async/NotificationQueue.h
index 076139f4..0b3ae9e4 100644
--- a/folly/io/async/NotificationQueue.h
+++ b/folly/io/async/NotificationQueue.h
@@ -27,13 +27,13 @@
 
 #include <folly/Exception.h>
 #include <folly/FileUtil.h>
-#include <folly/io/async/EventBase.h>
-#include <folly/io/async/EventHandler.h>
-#include <folly/io/async/DelayedDestruction.h>
-#include <folly/io/async/Request.h>
 #include <folly/Likely.h>
 #include <folly/ScopeGuard.h>
 #include <folly/SpinLock.h>
+#include <folly/io/async/DelayedDestruction.h>
+#include <folly/io/async/EventBase.h>
+#include <folly/io/async/EventHandler.h>
+#include <folly/io/async/Request.h>
 #include <folly/portability/Fcntl.h>
 #include <folly/portability/Sockets.h>
 #include <folly/portability/Unistd.h>
diff --git a/folly/io/async/SSLContext.h b/folly/io/async/SSLContext.h
index 548a84bd..589fdafc 100644
--- a/folly/io/async/SSLContext.h
+++ b/folly/io/async/SSLContext.h
@@ -16,13 +16,13 @@
 
 #pragma once
 
-#include <mutex>
 #include <list>
 #include <map>
-#include <vector>
 #include <memory>
-#include <string>
+#include <mutex>
 #include <random>
+#include <string>
+#include <vector>
 
 #include <glog/logging.h>
 
@@ -31,9 +31,9 @@
 #endif
 
 #include <folly/Range.h>
-#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/io/async/ssl/OpenSSLUtils.h>
 #include <folly/portability/OpenSSL.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 
 namespace folly {
 
diff --git a/folly/io/async/TimeoutManager.h b/folly/io/async/TimeoutManager.h
index 94128e32..96af4c2c 100644
--- a/folly/io/async/TimeoutManager.h
+++ b/folly/io/async/TimeoutManager.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <chrono>
-#include <stdint.h>
+#include <cstdint>
 
 #include <folly/Function.h>
 
diff --git a/folly/io/async/ssl/OpenSSLUtils.h b/folly/io/async/ssl/OpenSSLUtils.h
index 560d5cca..8914315a 100644
--- a/folly/io/async/ssl/OpenSSLUtils.h
+++ b/folly/io/async/ssl/OpenSSLUtils.h
@@ -16,9 +16,9 @@
 #pragma once
 
 #include <folly/Range.h>
-#include <folly/ssl/OpenSSLPtrTypes.h>
 #include <folly/portability/OpenSSL.h>
 #include <folly/portability/Sockets.h>
+#include <folly/ssl/OpenSSLPtrTypes.h>
 
 namespace folly {
 namespace ssl {
diff --git a/folly/io/async/test/AsyncPipeTest.cpp b/folly/io/async/test/AsyncPipeTest.cpp
index bbe172c3..1259e547 100644
--- a/folly/io/async/test/AsyncPipeTest.cpp
+++ b/folly/io/async/test/AsyncPipeTest.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
+#include <folly/Memory.h>
 #include <folly/io/async/AsyncPipe.h>
 #include <folly/io/async/EventBase.h>
-#include <folly/Memory.h>
 #include <folly/portability/GTest.h>
 
 #include <fcntl.h>
diff --git a/folly/io/async/test/AsyncSSLSocketTest.h b/folly/io/async/test/AsyncSSLSocketTest.h
index 816971d6..103b75c1 100644
--- a/folly/io/async/test/AsyncSSLSocketTest.h
+++ b/folly/io/async/test/AsyncSSLSocketTest.h
@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include <signal.h>
 #include <pthread.h>
+#include <signal.h>
 
 #include <folly/ExceptionWrapper.h>
 #include <folly/SocketAddress.h>
diff --git a/folly/io/async/test/AsyncSocketTest.cpp b/folly/io/async/test/AsyncSocketTest.cpp
index 28a72dba..a9f7e46a 100644
--- a/folly/io/async/test/AsyncSocketTest.cpp
+++ b/folly/io/async/test/AsyncSocketTest.cpp
@@ -15,8 +15,8 @@
  */
 #include <iostream>
 
-#include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/AsyncServerSocket.h>
+#include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/EventBase.h>
 #include <folly/portability/GTest.h>
 
diff --git a/folly/io/async/test/AsyncTransportTest.cpp b/folly/io/async/test/AsyncTransportTest.cpp
index 33837cd1..ddcd4480 100644
--- a/folly/io/async/test/AsyncTransportTest.cpp
+++ b/folly/io/async/test/AsyncTransportTest.cpp
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 #include <folly/io/async/AsyncTransport.h>
-#include <folly/io/async/AsyncSocket.h>
 
+#include <folly/io/async/AsyncSocket.h>
 #include <folly/io/async/test/MockAsyncTransport.h>
 #include <folly/portability/GTest.h>
 
diff --git a/folly/io/async/test/AsyncUDPSocketTest.cpp b/folly/io/async/test/AsyncUDPSocketTest.cpp
index ee420257..09ebfcc1 100644
--- a/folly/io/async/test/AsyncUDPSocketTest.cpp
+++ b/folly/io/async/test/AsyncUDPSocketTest.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <folly/io/async/AsyncUDPSocket.h>
-#include <folly/io/async/AsyncUDPServerSocket.h>
+#include <folly/SocketAddress.h>
 #include <folly/io/async/AsyncTimeout.h>
+#include <folly/io/async/AsyncUDPServerSocket.h>
+#include <folly/io/async/AsyncUDPSocket.h>
 #include <folly/io/async/EventBase.h>
-#include <folly/SocketAddress.h>
 
 #include <folly/io/IOBuf.h>
 #include <folly/portability/GTest.h>
diff --git a/folly/io/async/test/HHWheelTimerTest.cpp b/folly/io/async/test/HHWheelTimerTest.cpp
index a6c71353..a05bb698 100644
--- a/folly/io/async/test/HHWheelTimerTest.cpp
+++ b/folly/io/async/test/HHWheelTimerTest.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <folly/io/async/HHWheelTimer.h>
 #include <folly/io/async/EventBase.h>
+#include <folly/io/async/HHWheelTimer.h>
 #include <folly/io/async/test/UndelayedDestruction.h>
 #include <folly/io/async/test/Util.h>
 #include <folly/portability/GTest.h>
diff --git a/folly/io/async/test/NotificationQueueTest.cpp b/folly/io/async/test/NotificationQueueTest.cpp
index 614f2303..727eaad2 100644
--- a/folly/io/async/test/NotificationQueueTest.cpp
+++ b/folly/io/async/test/NotificationQueueTest.cpp
@@ -15,15 +15,16 @@
  */
 
 #include <folly/io/async/NotificationQueue.h>
-#include <folly/io/async/ScopedEventBaseThread.h>
 
-#include <folly/Baton.h>
-#include <folly/portability/GTest.h>
+#include <sys/types.h>
 
-#include <list>
 #include <iostream>
+#include <list>
 #include <thread>
-#include <sys/types.h>
+
+#include <folly/Baton.h>
+#include <folly/io/async/ScopedEventBaseThread.h>
+#include <folly/portability/GTest.h>
 
 #ifndef _WIN32
 #include <sys/wait.h>
diff --git a/folly/io/async/test/UndelayedDestruction.h b/folly/io/async/test/UndelayedDestruction.h
index 055fffe2..f944d606 100644
--- a/folly/io/async/test/UndelayedDestruction.h
+++ b/folly/io/async/test/UndelayedDestruction.h
@@ -16,10 +16,10 @@
 
 #pragma once
 
+#include <cassert>
 #include <cstdlib>
 #include <type_traits>
 #include <utility>
-#include <cassert>
 
 namespace folly {
 
diff --git a/folly/io/async/test/Util.h b/folly/io/async/test/Util.h
index fda4a527..17eb1bc6 100644
--- a/folly/io/async/test/Util.h
+++ b/folly/io/async/test/Util.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <folly/io/async/test/TimeUtil.h>
-#include <folly/test/TestUtils.h>
 #include <folly/portability/GTest.h>
+#include <folly/test/TestUtils.h>
 
 /**
  * Check how long a timeout took to fire.
diff --git a/folly/io/test/IOBufQueueTest.cpp b/folly/io/test/IOBufQueueTest.cpp
index a22715da..319b5286 100644
--- a/folly/io/test/IOBufQueueTest.cpp
+++ b/folly/io/test/IOBufQueueTest.cpp
@@ -16,9 +16,9 @@
 
 #include <folly/io/IOBufQueue.h>
 
+#include <cstring>
 #include <iostream>
 #include <stdexcept>
-#include <string.h>
 
 #include <folly/Range.h>
 #include <folly/portability/GTest.h>
diff --git a/folly/small_vector.h b/folly/small_vector.h
index f9c8067d..66198ee8 100644
--- a/folly/small_vector.h
+++ b/folly/small_vector.h
@@ -23,25 +23,25 @@
 
 #pragma once
 
-#include <stdexcept>
-#include <cstdlib>
-#include <type_traits>
 #include <algorithm>
-#include <iterator>
 #include <cassert>
+#include <cstdlib>
+#include <iterator>
+#include <stdexcept>
+#include <type_traits>
 
-#include <boost/operators.hpp>
-#include <boost/type_traits.hpp>
-#include <boost/mpl/if.hpp>
+#include <boost/mpl/count.hpp>
+#include <boost/mpl/empty.hpp>
 #include <boost/mpl/eval_if.hpp>
-#include <boost/mpl/vector.hpp>
-#include <boost/mpl/front.hpp>
 #include <boost/mpl/filter_view.hpp>
+#include <boost/mpl/front.hpp>
 #include <boost/mpl/identity.hpp>
+#include <boost/mpl/if.hpp>
 #include <boost/mpl/placeholders.hpp>
-#include <boost/mpl/empty.hpp>
 #include <boost/mpl/size.hpp>
-#include <boost/mpl/count.hpp>
+#include <boost/mpl/vector.hpp>
+#include <boost/operators.hpp>
+#include <boost/type_traits.hpp>
 
 #include <folly/Assume.h>
 #include <folly/FormatTraits.h>
diff --git a/folly/test/AHMIntStressTest.cpp b/folly/test/AHMIntStressTest.cpp
index e119cde9..a0837ca4 100644
--- a/folly/test/AHMIntStressTest.cpp
+++ b/folly/test/AHMIntStressTest.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <thread>
 #include <memory>
 #include <mutex>
+#include <thread>
 
 #include <folly/AtomicHashMap.h>
-#include <folly/ScopeGuard.h>
 #include <folly/Memory.h>
+#include <folly/ScopeGuard.h>
 #include <folly/portability/GTest.h>
 
 namespace {
diff --git a/folly/test/ArenaSmartPtrTest.cpp b/folly/test/ArenaSmartPtrTest.cpp
index bc216d24..5dddd97e 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/portability/GTest.h>
 
 using namespace folly;
diff --git a/folly/test/AtomicHashArrayTest.cpp b/folly/test/AtomicHashArrayTest.cpp
index a99d486d..3e9dacb2 100644
--- a/folly/test/AtomicHashArrayTest.cpp
+++ b/folly/test/AtomicHashArrayTest.cpp
@@ -22,8 +22,8 @@
 #include <folly/Conv.h>
 #include <folly/Hash.h>
 #include <folly/Memory.h>
-#include <folly/portability/SysMman.h>
 #include <folly/portability/GTest.h>
+#include <folly/portability/SysMman.h>
 
 using namespace std;
 using namespace folly;
diff --git a/folly/test/AtomicHashMapTest.cpp b/folly/test/AtomicHashMapTest.cpp
index e3f3ab00..ee2968db 100644
--- a/folly/test/AtomicHashMapTest.cpp
+++ b/folly/test/AtomicHashMapTest.cpp
@@ -16,10 +16,11 @@
 
 #include <folly/AtomicHashMap.h>
 
-#include <glog/logging.h>
-#include <thread>
 #include <atomic>
 #include <memory>
+#include <thread>
+
+#include <glog/logging.h>
 
 #include <folly/Benchmark.h>
 #include <folly/Conv.h>
diff --git a/folly/test/BatonTest.cpp b/folly/test/BatonTest.cpp
index 74b71798..ded7fb50 100644
--- a/folly/test/BatonTest.cpp
+++ b/folly/test/BatonTest.cpp
@@ -15,12 +15,13 @@
  */
 
 #include <folly/Baton.h>
-#include <folly/test/BatonTestHelpers.h>
-#include <folly/test/DeterministicSchedule.h>
-#include <folly/portability/GTest.h>
 
 #include <thread>
 
+#include <folly/portability/GTest.h>
+#include <folly/test/BatonTestHelpers.h>
+#include <folly/test/DeterministicSchedule.h>
+
 using namespace folly;
 using namespace folly::test;
 using folly::detail::EmulatedFutexAtomic;
diff --git a/folly/test/BatonTestHelpers.h b/folly/test/BatonTestHelpers.h
index e4de09df..7dfdc81d 100644
--- a/folly/test/BatonTestHelpers.h
+++ b/folly/test/BatonTestHelpers.h
@@ -17,8 +17,8 @@
 #pragma once
 
 #include <folly/Baton.h>
-#include <folly/test/DeterministicSchedule.h>
 #include <folly/portability/GTest.h>
+#include <folly/test/DeterministicSchedule.h>
 
 namespace folly {
 namespace test {
diff --git a/folly/test/BitIteratorTest.cpp b/folly/test/BitIteratorTest.cpp
index 9ddaeec5..49001d86 100644
--- a/folly/test/BitIteratorTest.cpp
+++ b/folly/test/BitIteratorTest.cpp
@@ -17,8 +17,8 @@
 #include <folly/Bits.h>
 
 #include <algorithm>
-#include <type_traits>
 #include <limits>
+#include <type_traits>
 #include <vector>
 
 #include <folly/Benchmark.h>
diff --git a/folly/test/ChecksumTest.cpp b/folly/test/ChecksumTest.cpp
index 0d7bde12..b54e528e 100644
--- a/folly/test/ChecksumTest.cpp
+++ b/folly/test/ChecksumTest.cpp
@@ -17,6 +17,7 @@
 #include <folly/Checksum.h>
 
 #include <boost/crc.hpp>
+
 #include <folly/Benchmark.h>
 #include <folly/Hash.h>
 #include <folly/detail/ChecksumDetail.h>
diff --git a/folly/test/ClockGettimeWrappersTest.cpp b/folly/test/ClockGettimeWrappersTest.cpp
index a46ffc1c..549594a6 100644
--- a/folly/test/ClockGettimeWrappersTest.cpp
+++ b/folly/test/ClockGettimeWrappersTest.cpp
@@ -16,11 +16,11 @@
 
 #include <folly/ClockGettimeWrappers.h>
 
-#include <folly/test/TestUtils.h>
-#include <folly/portability/GTest.h>
-
 #include <chrono>
 
+#include <folly/portability/GTest.h>
+#include <folly/test/TestUtils.h>
+
 static constexpr auto kAcceptableDeltaSecs = std::chrono::seconds(120);
 
 using folly::test::AreWithinSecs;
diff --git a/folly/test/ConcurrentSkipListTest.cpp b/folly/test/ConcurrentSkipListTest.cpp
index 2e578e5a..87f416b7 100644
--- a/folly/test/ConcurrentSkipListTest.cpp
+++ b/folly/test/ConcurrentSkipListTest.cpp
@@ -21,9 +21,9 @@
 #include <atomic>
 #include <memory>
 #include <set>
-#include <vector>
-#include <thread>
 #include <system_error>
+#include <thread>
+#include <vector>
 
 #include <glog/logging.h>
 
diff --git a/folly/test/ExceptionWrapperTest.cpp b/folly/test/ExceptionWrapperTest.cpp
index 36f7298f..9d7db865 100644
--- a/folly/test/ExceptionWrapperTest.cpp
+++ b/folly/test/ExceptionWrapperTest.cpp
@@ -16,8 +16,8 @@
 
 #include <stdexcept>
 
-#include <folly/ExceptionWrapper.h>
 #include <folly/Conv.h>
+#include <folly/ExceptionWrapper.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;
diff --git a/folly/test/FBStringBenchmark.cpp b/folly/test/FBStringBenchmark.cpp
index f50a2894..342ede96 100644
--- a/folly/test/FBStringBenchmark.cpp
+++ b/folly/test/FBStringBenchmark.cpp
@@ -20,8 +20,8 @@
 #include <folly/FBString.h>
 
 #include <cstdlib>
-#include <list>
 #include <fstream>
+#include <list>
 #include <sstream>
 
 #include <boost/random.hpp>
diff --git a/folly/test/FBStringTest.cpp b/folly/test/FBStringTest.cpp
index c2110d1f..92f32eb3 100644
--- a/folly/test/FBStringTest.cpp
+++ b/folly/test/FBStringTest.cpp
@@ -21,17 +21,17 @@
 
 #include <atomic>
 #include <cstdlib>
-
 #include <iomanip>
 #include <list>
 #include <sstream>
+
 #include <boost/algorithm/string.hpp>
 #include <boost/random.hpp>
 
+#include <folly/Conv.h>
 #include <folly/Foreach.h>
 #include <folly/Portability.h>
 #include <folly/Random.h>
-#include <folly/Conv.h>
 #include <folly/portability/GTest.h>
 
 using namespace std;
diff --git a/folly/test/FBVectorBenchmark.cpp b/folly/test/FBVectorBenchmark.cpp
index 8884e695..ca327cdf 100644
--- a/folly/test/FBVectorBenchmark.cpp
+++ b/folly/test/FBVectorBenchmark.cpp
@@ -17,6 +17,11 @@
 //
 // Author: andrei.alexandrescu@fb.com
 
+#include <list>
+#include <memory>
+
+#include <boost/random.hpp>
+
 #include <folly/Benchmark.h>
 #include <folly/FBString.h>
 #include <folly/FBVector.h>
@@ -26,10 +31,6 @@
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
 
-#include <list>
-#include <memory>
-#include <boost/random.hpp>
-
 using namespace std;
 using namespace folly;
 
diff --git a/folly/test/FBVectorTest.cpp b/folly/test/FBVectorTest.cpp
index 7997da70..604cd05a 100644
--- a/folly/test/FBVectorTest.cpp
+++ b/folly/test/FBVectorTest.cpp
@@ -17,18 +17,20 @@
 //
 // Author: andrei.alexandrescu@fb.com
 
-#include <folly/Foreach.h>
-#include <folly/Traits.h>
-#include <folly/Random.h>
-#include <folly/FBString.h>
 #include <folly/FBVector.h>
-#include <folly/portability/GTest.h>
 
 #include <list>
 #include <map>
 #include <memory>
+
 #include <boost/random.hpp>
 
+#include <folly/FBString.h>
+#include <folly/Foreach.h>
+#include <folly/Random.h>
+#include <folly/Traits.h>
+#include <folly/portability/GTest.h>
+
 using namespace std;
 using namespace folly;
 
diff --git a/folly/test/FileLockTest.cpp b/folly/test/FileLockTest.cpp
index a72995cc..85e5409c 100644
--- a/folly/test/FileLockTest.cpp
+++ b/folly/test/FileLockTest.cpp
@@ -18,8 +18,8 @@
 
 #include <mutex>
 
-#include <glog/logging.h>
 #include <boost/thread/locks.hpp>
+#include <glog/logging.h>
 
 #include <folly/String.h>
 #include <folly/Subprocess.h>
diff --git a/folly/test/FingerprintBenchmark.cpp b/folly/test/FingerprintBenchmark.cpp
index 5e26a673..cd02a111 100644
--- a/folly/test/FingerprintBenchmark.cpp
+++ b/folly/test/FingerprintBenchmark.cpp
@@ -15,10 +15,11 @@
  */
 
 #include <random>
+
 #include <folly/Benchmark.h>
+#include <folly/Fingerprint.h>
 #include <folly/Format.h>
 #include <folly/detail/SlowFingerprint.h>
-#include <folly/Fingerprint.h>
 
 using namespace std;
 using namespace folly;
diff --git a/folly/test/FingerprintTest.cpp b/folly/test/FingerprintTest.cpp
index e0542498..e8ef9ac1 100644
--- a/folly/test/FingerprintTest.cpp
+++ b/folly/test/FingerprintTest.cpp
@@ -18,8 +18,8 @@
 
 #include <glog/logging.h>
 
-#include <folly/detail/SlowFingerprint.h>
 #include <folly/Benchmark.h>
+#include <folly/detail/SlowFingerprint.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;
diff --git a/folly/test/ForeachTest.cpp b/folly/test/ForeachTest.cpp
index 367c3a42..6940cc7d 100644
--- a/folly/test/ForeachTest.cpp
+++ b/folly/test/ForeachTest.cpp
@@ -16,12 +16,12 @@
 
 #include <folly/Foreach.h>
 
-#include <folly/portability/GTest.h>
-
+#include <list>
 #include <map>
 #include <string>
 #include <vector>
-#include <list>
+
+#include <folly/portability/GTest.h>
 
 using namespace folly;
 using namespace folly::detail;
diff --git a/folly/test/FutexTest.cpp b/folly/test/FutexTest.cpp
index b64238b6..db57ef9e 100644
--- a/folly/test/FutexTest.cpp
+++ b/folly/test/FutexTest.cpp
@@ -24,8 +24,8 @@
 
 #include <glog/logging.h>
 
-#include <folly/portability/Time.h>
 #include <folly/portability/GTest.h>
+#include <folly/portability/Time.h>
 
 using namespace folly::detail;
 using namespace folly::test;
diff --git a/folly/test/GroupVarintTest.cpp b/folly/test/GroupVarintTest.cpp
index 061e9fa7..b224674d 100644
--- a/folly/test/GroupVarintTest.cpp
+++ b/folly/test/GroupVarintTest.cpp
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-#include <stdarg.h>
-#include <algorithm>
 #include <folly/GroupVarint.h>
 
+#include <algorithm>
+#include <cstdarg>
+
 // On platforms where it's not supported, GroupVarint will be compiled out.
 #if HAVE_GROUP_VARINT
 
diff --git a/folly/test/LazyTest.cpp b/folly/test/LazyTest.cpp
index 5fe9c808..b11dc11e 100644
--- a/folly/test/LazyTest.cpp
+++ b/folly/test/LazyTest.cpp
@@ -15,9 +15,9 @@
  */
 #include <folly/Lazy.h>
 
-#include <map>
 #include <functional>
 #include <iostream>
+#include <map>
 
 #include <folly/portability/GTest.h>
 
diff --git a/folly/test/MemoryTest.cpp b/folly/test/MemoryTest.cpp
index f5df99fb..5ad28d5a 100644
--- a/folly/test/MemoryTest.cpp
+++ b/folly/test/MemoryTest.cpp
@@ -15,15 +15,16 @@
  */
 
 #include <folly/Memory.h>
-#include <folly/Arena.h>
-#include <folly/String.h>
-#include <folly/portability/GTest.h>
-
-#include <glog/logging.h>
 
 #include <type_traits>
 #include <utility>
 
+#include <glog/logging.h>
+
+#include <folly/Arena.h>
+#include <folly/String.h>
+#include <folly/portability/GTest.h>
+
 using namespace folly;
 
 TEST(make_unique, compatible_with_std_make_unique) {
diff --git a/folly/test/ProducerConsumerQueueBenchmark.cpp b/folly/test/ProducerConsumerQueueBenchmark.cpp
index d37ac911..01b83d97 100644
--- a/folly/test/ProducerConsumerQueueBenchmark.cpp
+++ b/folly/test/ProducerConsumerQueueBenchmark.cpp
@@ -16,17 +16,20 @@
 
 // @author: Bert Maher <bertrand@fb.com>
 
-#include <thread>
-#include <iostream>
-#include <stdio.h>
+#include <folly/ProducerConsumerQueue.h>
+
 #include <pthread.h>
 
+#include <cstdio>
+#include <iostream>
+#include <thread>
+
+#include <glog/logging.h>
+
 #include <folly/Benchmark.h>
-#include <folly/ProducerConsumerQueue.h>
 #include <folly/portability/GFlags.h>
 #include <folly/stats/Histogram.h>
 #include <folly/stats/Histogram-defs.h>
-#include <glog/logging.h>
 
 namespace {
 
diff --git a/folly/test/RWSpinLockTest.cpp b/folly/test/RWSpinLockTest.cpp
index 1f9c9eef..8323d08d 100644
--- a/folly/test/RWSpinLockTest.cpp
+++ b/folly/test/RWSpinLockTest.cpp
@@ -21,8 +21,8 @@
 #include <folly/RWSpinLock.h>
 
 #include <stdlib.h>
-#include <vector>
 #include <thread>
+#include <vector>
 
 #include <glog/logging.h>
 
diff --git a/folly/test/RandomBenchmark.cpp b/folly/test/RandomBenchmark.cpp
index 287482e5..60f6c5bc 100644
--- a/folly/test/RandomBenchmark.cpp
+++ b/folly/test/RandomBenchmark.cpp
@@ -16,13 +16,13 @@
 
 #include <folly/Random.h>
 
-#include <folly/Benchmark.h>
-#include <folly/Foreach.h>
+#include <random>
+#include <thread>
 
 #include <glog/logging.h>
 
-#include <thread>
-#include <random>
+#include <folly/Benchmark.h>
+#include <folly/Foreach.h>
 
 using namespace folly;
 
diff --git a/folly/test/RandomTest.cpp b/folly/test/RandomTest.cpp
index 25a2070b..30f99251 100644
--- a/folly/test/RandomTest.cpp
+++ b/folly/test/RandomTest.cpp
@@ -16,13 +16,13 @@
 
 #include <folly/Random.h>
 
-#include <glog/logging.h>
-
 #include <algorithm>
-#include <thread>
-#include <vector>
 #include <random>
+#include <thread>
 #include <unordered_set>
+#include <vector>
+
+#include <glog/logging.h>
 
 #include <folly/portability/GTest.h>
 
diff --git a/folly/test/RangeFindBenchmark.cpp b/folly/test/RangeFindBenchmark.cpp
index 5ba07925..ec15a1cc 100644
--- a/folly/test/RangeFindBenchmark.cpp
+++ b/folly/test/RangeFindBenchmark.cpp
@@ -15,13 +15,15 @@
  */
 
 #include <folly/Range.h>
-#include <folly/Benchmark.h>
-#include <folly/Foreach.h>
+
 #include <algorithm>
 #include <iostream>
 #include <random>
 #include <string>
 
+#include <folly/Benchmark.h>
+#include <folly/Foreach.h>
+
 using namespace folly;
 using namespace std;
 
diff --git a/folly/test/RangeTest.cpp b/folly/test/RangeTest.cpp
index 8a2b2762..a3898856 100644
--- a/folly/test/RangeTest.cpp
+++ b/folly/test/RangeTest.cpp
@@ -19,10 +19,6 @@
 
 #include <folly/Range.h>
 
-#include <folly/portability/GTest.h>
-#include <folly/portability/Memory.h>
-#include <folly/portability/SysMman.h>
-
 #include <array>
 #include <iterator>
 #include <limits>
@@ -30,8 +26,13 @@
 #include <string>
 #include <type_traits>
 #include <vector>
-#include <boost/range/concepts.hpp>
+
 #include <boost/algorithm/string/trim.hpp>
+#include <boost/range/concepts.hpp>
+
+#include <folly/portability/GTest.h>
+#include <folly/portability/Memory.h>
+#include <folly/portability/SysMman.h>
 
 using namespace folly;
 using namespace folly::detail;
diff --git a/folly/test/SingletonTest.cpp b/folly/test/SingletonTest.cpp
index be95ea4d..67f88f1a 100644
--- a/folly/test/SingletonTest.cpp
+++ b/folly/test/SingletonTest.cpp
@@ -16,6 +16,9 @@
 
 #include <thread>
 
+#include <boost/thread/barrier.hpp>
+#include <glog/logging.h>
+
 #include <folly/Singleton.h>
 #include <folly/experimental/io/FsUtil.h>
 #include <folly/io/async/EventBase.h>
@@ -27,9 +30,6 @@
 #include <folly/Subprocess.h>
 #endif
 
-#include <glog/logging.h>
-#include <boost/thread/barrier.hpp>
-
 FOLLY_GCC_DISABLE_WARNING("-Wdeprecated-declarations")
 
 using namespace folly;
diff --git a/folly/test/SingletonTestGlobal.cpp b/folly/test/SingletonTestGlobal.cpp
index 825770f9..6a2b01e5 100644
--- a/folly/test/SingletonTestGlobal.cpp
+++ b/folly/test/SingletonTestGlobal.cpp
@@ -17,10 +17,10 @@
 #include <memory>
 #include <vector>
 
-#include <folly/Singleton.h>
 #include <folly/Benchmark.h>
-#include <folly/test/SingletonTestStructs.h>
+#include <folly/Singleton.h>
 #include <folly/portability/GTest.h>
+#include <folly/test/SingletonTestStructs.h>
 
 /*
  * This test needs to be in its own file, as a standalone program.
diff --git a/folly/test/SmallLocksTest.cpp b/folly/test/SmallLocksTest.cpp
index 77f42db7..1e71086f 100644
--- a/folly/test/SmallLocksTest.cpp
+++ b/folly/test/SmallLocksTest.cpp
@@ -16,18 +16,17 @@
 
 #include <folly/SmallLocks.h>
 
-#include <folly/Random.h>
+#include <pthread.h>
 
 #include <cassert>
+#include <condition_variable>
 #include <cstdio>
 #include <mutex>
-#include <condition_variable>
 #include <string>
-#include <vector>
-#include <pthread.h>
-
 #include <thread>
+#include <vector>
 
+#include <folly/Random.h>
 #include <folly/portability/Asm.h>
 #include <folly/portability/GTest.h>
 #include <folly/portability/Unistd.h>
diff --git a/folly/test/SpookyHashV1Test.cpp b/folly/test/SpookyHashV1Test.cpp
index 19ca5453..e5b4eb12 100644
--- a/folly/test/SpookyHashV1Test.cpp
+++ b/folly/test/SpookyHashV1Test.cpp
@@ -21,17 +21,18 @@
 #endif
 
 #include <folly/SpookyHashV1.h>
-#include <folly/portability/GTest.h>
-#include <folly/portability/Time.h>
 
 #include <cinttypes>
-#include <cstdio>
 #include <cstddef>
-#include <cstring>
+#include <cstdio>
 #include <cstdlib>
+#include <cstring>
 
 #include <glog/logging.h>
 
+#include <folly/portability/GTest.h>
+#include <folly/portability/Time.h>
+
 using namespace ::folly::hash;
 
 static bool failed = false;
diff --git a/folly/test/SpookyHashV2Test.cpp b/folly/test/SpookyHashV2Test.cpp
index 084760cd..227b4fb7 100644
--- a/folly/test/SpookyHashV2Test.cpp
+++ b/folly/test/SpookyHashV2Test.cpp
@@ -21,17 +21,18 @@
 #endif
 
 #include <folly/SpookyHashV2.h>
-#include <folly/portability/GTest.h>
-#include <folly/portability/Time.h>
 
 #include <cinttypes>
-#include <cstdio>
 #include <cstddef>
-#include <cstring>
+#include <cstdio>
 #include <cstdlib>
+#include <cstring>
 
 #include <glog/logging.h>
 
+#include <folly/portability/GTest.h>
+#include <folly/portability/Time.h>
+
 using namespace ::folly::hash;
 
 static bool failed = false;
diff --git a/folly/test/SubprocessTestParentDeathHelper.cpp b/folly/test/SubprocessTestParentDeathHelper.cpp
index 2cfe95f0..100cc81f 100644
--- a/folly/test/SubprocessTestParentDeathHelper.cpp
+++ b/folly/test/SubprocessTestParentDeathHelper.cpp
@@ -22,9 +22,9 @@
 // will verify that the file actually gets created, which means that everything
 // worked as intended.
 
-#include <sys/types.h>
 #include <fcntl.h>
 #include <signal.h>
+#include <sys/types.h>
 
 #include <glog/logging.h>
 
diff --git a/folly/test/SynchronizedTest.cpp b/folly/test/SynchronizedTest.cpp
index c95d0f14..db0f9c93 100644
--- a/folly/test/SynchronizedTest.cpp
+++ b/folly/test/SynchronizedTest.cpp
@@ -24,8 +24,8 @@
 #include <folly/SharedMutex.h>
 #include <folly/SpinLock.h>
 #include <folly/Synchronized.h>
-#include <folly/test/SynchronizedTestLib.h>
 #include <folly/portability/GTest.h>
+#include <folly/test/SynchronizedTestLib.h>
 
 using namespace folly::sync_tests;
 
diff --git a/folly/test/ThreadCachedArenaTest.cpp b/folly/test/ThreadCachedArenaTest.cpp
index e835ae99..458239db 100644
--- a/folly/test/ThreadCachedArenaTest.cpp
+++ b/folly/test/ThreadCachedArenaTest.cpp
@@ -15,20 +15,20 @@
  */
 
 #include <folly/ThreadCachedArena.h>
-#include <folly/Memory.h>
 
+#include <algorithm>
+#include <iterator>
 #include <map>
 #include <mutex>
-#include <thread>
-#include <iterator>
-#include <algorithm>
 #include <random>
+#include <thread>
 #include <unordered_map>
 
 #include <glog/logging.h>
 
-#include <folly/Range.h>
 #include <folly/Benchmark.h>
+#include <folly/Memory.h>
+#include <folly/Range.h>
 #include <folly/portability/GTest.h>
 
 using namespace folly;
diff --git a/folly/test/ThreadLocalTest.cpp b/folly/test/ThreadLocalTest.cpp
index 62526ebc..2aeb2054 100644
--- a/folly/test/ThreadLocalTest.cpp
+++ b/folly/test/ThreadLocalTest.cpp
@@ -26,8 +26,8 @@
 #include <array>
 #include <atomic>
 #include <chrono>
+#include <climits>
 #include <condition_variable>
-#include <limits.h>
 #include <map>
 #include <mutex>
 #include <set>
diff --git a/folly/test/stl_tests/StlVectorTest.cpp b/folly/test/stl_tests/StlVectorTest.cpp
index 6ca2a7fc..f82d741a 100644
--- a/folly/test/stl_tests/StlVectorTest.cpp
+++ b/folly/test/stl_tests/StlVectorTest.cpp
@@ -168,18 +168,18 @@ THOUGHTS:
 
 //#define USING_STD_VECTOR
 
+#include <climits>
+#include <cstddef>
+#include <exception>
+#include <iomanip>
 #include <iostream>
-#include <sstream>
-#include <typeinfo>
-#include <type_traits>
 #include <map>
 #include <set>
-#include <string>
+#include <sstream>
 #include <stdexcept>
-#include <exception>
-#include <climits>
-#include <cstddef>
-#include <iomanip>
+#include <string>
+#include <type_traits>
+#include <typeinfo>
 
 #include <boost/iterator/iterator_adaptor.hpp>
 #include <boost/preprocessor.hpp>