Sort include files according to convention.
llvm-svn: 220131
diff --git a/lld/include/lld/Core/Alias.h b/lld/include/lld/Core/Alias.h
index 31b6f41..6100225 100644
--- a/lld/include/lld/Core/Alias.h
+++ b/lld/include/lld/Core/Alias.h
@@ -18,7 +18,6 @@
#include "lld/Core/LLVM.h"
#include "lld/Core/Simple.h"
#include "llvm/ADT/Optional.h"
-
#include <string>
namespace lld {
diff --git a/lld/include/lld/Core/ArchiveLibraryFile.h b/lld/include/lld/Core/ArchiveLibraryFile.h
index 848c509..76d450d 100644
--- a/lld/include/lld/Core/ArchiveLibraryFile.h
+++ b/lld/include/lld/Core/ArchiveLibraryFile.h
@@ -11,7 +11,6 @@
#define LLD_CORE_ARCHIVE_LIBRARY_FILE_H
#include "lld/Core/File.h"
-
#include <set>
namespace lld {
diff --git a/lld/include/lld/Core/File.h b/lld/include/lld/Core/File.h
index 6d20622..2e9dbaa 100644
--- a/lld/include/lld/Core/File.h
+++ b/lld/include/lld/Core/File.h
@@ -12,13 +12,11 @@
#include "lld/Core/AbsoluteAtom.h"
#include "lld/Core/DefinedAtom.h"
-#include "lld/Core/range.h"
-#include "lld/Core/SharedLibraryAtom.h"
#include "lld/Core/LinkingContext.h"
+#include "lld/Core/SharedLibraryAtom.h"
#include "lld/Core/UndefinedAtom.h"
-
+#include "lld/Core/range.h"
#include "llvm/Support/ErrorHandling.h"
-
#include <vector>
namespace lld {
diff --git a/lld/include/lld/Core/InputGraph.h b/lld/include/lld/Core/InputGraph.h
index fe178ae..d662c14 100644
--- a/lld/include/lld/Core/InputGraph.h
+++ b/lld/include/lld/Core/InputGraph.h
@@ -17,13 +17,12 @@
#define LLD_CORE_INPUT_GRAPH_H
#include "lld/Core/File.h"
-#include "llvm/Option/ArgList.h"
-
+#include "lld/Core/range.h"
#include "llvm/ADT/STLExtras.h"
+#include "llvm/Option/ArgList.h"
#include "llvm/Support/ErrorOr.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/raw_ostream.h"
-
#include <functional>
#include <memory>
#include <stack>
diff --git a/lld/include/lld/Core/Instrumentation.h b/lld/include/lld/Core/Instrumentation.h
index 32f7093..46a04ea 100644
--- a/lld/include/lld/Core/Instrumentation.h
+++ b/lld/include/lld/Core/Instrumentation.h
@@ -16,7 +16,6 @@
#define LLD_CORE_INSTRUMENTATION_H
#include "llvm/Support/Compiler.h"
-
#include <utility>
#ifdef LLD_HAS_VTUNE
diff --git a/lld/include/lld/Core/LLVM.h b/lld/include/lld/Core/LLVM.h
index 116cd4e..1bc1173 100644
--- a/lld/include/lld/Core/LLVM.h
+++ b/lld/include/lld/Core/LLVM.h
@@ -19,7 +19,6 @@
// clients.
#include "llvm/ADT/Hashing.h"
#include "llvm/Support/Casting.h"
-
#include <utility>
namespace llvm {
diff --git a/lld/include/lld/Core/LinkingContext.h b/lld/include/lld/Core/LinkingContext.h
index c6e60c8..b519373 100644
--- a/lld/include/lld/Core/LinkingContext.h
+++ b/lld/include/lld/Core/LinkingContext.h
@@ -13,14 +13,11 @@
#include "lld/Core/Error.h"
#include "lld/Core/InputGraph.h"
#include "lld/Core/LLVM.h"
-#include "lld/Core/range.h"
#include "lld/Core/Reference.h"
-
+#include "lld/Core/range.h"
#include "lld/ReaderWriter/Reader.h"
-
#include "llvm/Support/ErrorOr.h"
#include "llvm/Support/raw_ostream.h"
-
#include <string>
#include <vector>
diff --git a/lld/include/lld/Core/Parallel.h b/lld/include/lld/Core/Parallel.h
index 09c0a1d..85e2cab 100644
--- a/lld/include/lld/Core/Parallel.h
+++ b/lld/include/lld/Core/Parallel.h
@@ -13,7 +13,6 @@
#include "lld/Core/Instrumentation.h"
#include "lld/Core/LLVM.h"
#include "lld/Core/range.h"
-
#include "llvm/Support/MathExtras.h"
#ifdef _MSC_VER
diff --git a/lld/include/lld/Core/Pass.h b/lld/include/lld/Core/Pass.h
index f894dd8..7a9d245 100644
--- a/lld/include/lld/Core/Pass.h
+++ b/lld/include/lld/Core/Pass.h
@@ -12,9 +12,8 @@
#include "lld/Core/Atom.h"
#include "lld/Core/File.h"
-#include "lld/Core/range.h"
#include "lld/Core/Reference.h"
-
+#include "lld/Core/range.h"
#include <vector>
namespace lld {
diff --git a/lld/include/lld/Core/PassManager.h b/lld/include/lld/Core/PassManager.h
index 24e3c84..65fc4d8 100644
--- a/lld/include/lld/Core/PassManager.h
+++ b/lld/include/lld/Core/PassManager.h
@@ -12,7 +12,6 @@
#include "lld/Core/LLVM.h"
#include "lld/Core/Pass.h"
-
#include <memory>
#include <vector>
diff --git a/lld/include/lld/Core/Reference.h b/lld/include/lld/Core/Reference.h
index f1a5271..cbe5744 100644
--- a/lld/include/lld/Core/Reference.h
+++ b/lld/include/lld/Core/Reference.h
@@ -11,7 +11,6 @@
#define LLD_CORE_REFERENCES_H
#include "lld/Core/LLVM.h"
-
#include "llvm/ADT/StringSwitch.h"
namespace lld {
diff --git a/lld/include/lld/Core/Resolver.h b/lld/include/lld/Core/Resolver.h
index dadb231..64f962e 100644
--- a/lld/include/lld/Core/Resolver.h
+++ b/lld/include/lld/Core/Resolver.h
@@ -13,10 +13,8 @@
#include "lld/Core/File.h"
#include "lld/Core/SharedLibraryFile.h"
#include "lld/Core/SymbolTable.h"
-
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/DenseSet.h"
-
#include <set>
#include <vector>
diff --git a/lld/include/lld/Core/SymbolTable.h b/lld/include/lld/Core/SymbolTable.h
index 57a608e..c160b22 100644
--- a/lld/include/lld/Core/SymbolTable.h
+++ b/lld/include/lld/Core/SymbolTable.h
@@ -11,10 +11,8 @@
#define LLD_CORE_SYMBOL_TABLE_H
#include "lld/Core/LLVM.h"
-
#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/StringExtras.h"
-
#include <cstring>
#include <map>
#include <vector>
diff --git a/lld/include/lld/Core/range.h b/lld/include/lld/Core/range.h
index e4b6e25..614c967 100644
--- a/lld/include/lld/Core/range.h
+++ b/lld/include/lld/Core/range.h
@@ -18,9 +18,8 @@
#define LLD_CORE_RANGE_H
#include "llvm/Support/Compiler.h"
-
-#include <cassert>
#include <array>
+#include <cassert>
#include <iterator>
#include <string>
#include <type_traits>
diff --git a/lld/include/lld/Driver/CoreInputGraph.h b/lld/include/lld/Driver/CoreInputGraph.h
index d16bfec..abce9b9 100644
--- a/lld/include/lld/Driver/CoreInputGraph.h
+++ b/lld/include/lld/Driver/CoreInputGraph.h
@@ -21,7 +21,6 @@
#include "lld/ReaderWriter/CoreLinkingContext.h"
#include "lld/ReaderWriter/Reader.h"
#include "llvm/Support/Errc.h"
-
#include <map>
#include <memory>
diff --git a/lld/include/lld/Driver/Driver.h b/lld/include/lld/Driver/Driver.h
index fa8ab72..6ea7ca6 100644
--- a/lld/include/lld/Driver/Driver.h
+++ b/lld/include/lld/Driver/Driver.h
@@ -19,10 +19,8 @@
#include "lld/Core/InputGraph.h"
#include "lld/Core/LLVM.h"
-
#include "llvm/ADT/Triple.h"
#include "llvm/Support/raw_ostream.h"
-
#include <memory>
#include <set>
#include <vector>
diff --git a/lld/include/lld/Driver/WinLinkInputGraph.h b/lld/include/lld/Driver/WinLinkInputGraph.h
index 326ef3e..4f05197 100644
--- a/lld/include/lld/Driver/WinLinkInputGraph.h
+++ b/lld/include/lld/Driver/WinLinkInputGraph.h
@@ -19,7 +19,6 @@
#include "lld/Core/InputGraph.h"
#include "lld/ReaderWriter/PECOFFLinkingContext.h"
-
#include <map>
namespace lld {
diff --git a/lld/include/lld/Driver/WinLinkModuleDef.h b/lld/include/lld/Driver/WinLinkModuleDef.h
index 9bf2eb2..68c9a4b 100644
--- a/lld/include/lld/Driver/WinLinkModuleDef.h
+++ b/lld/include/lld/Driver/WinLinkModuleDef.h
@@ -19,7 +19,6 @@
#include "lld/ReaderWriter/PECOFFLinkingContext.h"
#include "llvm/ADT/Optional.h"
#include "llvm/Support/Allocator.h"
-
#include <vector>
namespace lld {
diff --git a/lld/include/lld/Passes/LayoutPass.h b/lld/include/lld/Passes/LayoutPass.h
index 3392480..e59a3cc 100644
--- a/lld/include/lld/Passes/LayoutPass.h
+++ b/lld/include/lld/Passes/LayoutPass.h
@@ -13,9 +13,7 @@
#include "lld/Core/File.h"
#include "lld/Core/Pass.h"
#include "lld/ReaderWriter/Reader.h"
-
#include "llvm/ADT/DenseMap.h"
-
#include <map>
#include <string>
#include <vector>
diff --git a/lld/include/lld/Passes/RoundTripNativePass.h b/lld/include/lld/Passes/RoundTripNativePass.h
index 4b3298d..796fee8 100644
--- a/lld/include/lld/Passes/RoundTripNativePass.h
+++ b/lld/include/lld/Passes/RoundTripNativePass.h
@@ -13,7 +13,6 @@
#include "lld/Core/File.h"
#include "lld/Core/LinkingContext.h"
#include "lld/Core/Pass.h"
-
#include <vector>
namespace lld {
diff --git a/lld/include/lld/Passes/RoundTripYAMLPass.h b/lld/include/lld/Passes/RoundTripYAMLPass.h
index 0374c1a..7f05673 100644
--- a/lld/include/lld/Passes/RoundTripYAMLPass.h
+++ b/lld/include/lld/Passes/RoundTripYAMLPass.h
@@ -13,7 +13,6 @@
#include "lld/Core/File.h"
#include "lld/Core/LinkingContext.h"
#include "lld/Core/Pass.h"
-
#include <vector>
namespace lld {
diff --git a/lld/include/lld/ReaderWriter/CoreLinkingContext.h b/lld/include/lld/ReaderWriter/CoreLinkingContext.h
index c74ff81..b087fd4 100644
--- a/lld/include/lld/ReaderWriter/CoreLinkingContext.h
+++ b/lld/include/lld/ReaderWriter/CoreLinkingContext.h
@@ -13,7 +13,6 @@
#include "lld/Core/LinkingContext.h"
#include "lld/ReaderWriter/Reader.h"
#include "lld/ReaderWriter/Writer.h"
-
#include "llvm/Support/ErrorHandling.h"
namespace lld {
diff --git a/lld/include/lld/ReaderWriter/ELFLinkingContext.h b/lld/include/lld/ReaderWriter/ELFLinkingContext.h
index 582b345..eda445b 100644
--- a/lld/include/lld/ReaderWriter/ELFLinkingContext.h
+++ b/lld/include/lld/ReaderWriter/ELFLinkingContext.h
@@ -11,19 +11,16 @@
#define LLD_READER_WRITER_ELF_LINKER_CONTEXT_H
#include "lld/Core/LinkingContext.h"
-#include "lld/Core/PassManager.h"
#include "lld/Core/Pass.h"
-#include "lld/Core/range.h"
+#include "lld/Core/PassManager.h"
#include "lld/Core/STDExtras.h"
-
+#include "lld/Core/range.h"
#include "lld/ReaderWriter/Reader.h"
#include "lld/ReaderWriter/Writer.h"
-
#include "llvm/ADT/StringSet.h"
#include "llvm/ADT/Triple.h"
#include "llvm/Object/ELF.h"
#include "llvm/Support/ELF.h"
-
#include <map>
#include <memory>
diff --git a/lld/include/lld/ReaderWriter/MachOLinkingContext.h b/lld/include/lld/ReaderWriter/MachOLinkingContext.h
index ad40dd0..4132c74 100644
--- a/lld/include/lld/ReaderWriter/MachOLinkingContext.h
+++ b/lld/include/lld/ReaderWriter/MachOLinkingContext.h
@@ -13,12 +13,10 @@
#include "lld/Core/LinkingContext.h"
#include "lld/ReaderWriter/Reader.h"
#include "lld/ReaderWriter/Writer.h"
-
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/StringSet.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/MachO.h"
-
#include <set>
using llvm::MachO::HeaderFileType;
diff --git a/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h b/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h
index b6d416f..8553bbf 100644
--- a/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h
+++ b/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h
@@ -13,13 +13,11 @@
#include "lld/Core/LinkingContext.h"
#include "lld/ReaderWriter/Reader.h"
#include "lld/ReaderWriter/Writer.h"
-
#include "llvm/ADT/ArrayRef.h"
#include "llvm/Support/Allocator.h"
#include "llvm/Support/COFF.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FileUtilities.h"
-
#include <map>
#include <mutex>
#include <set>
diff --git a/lld/include/lld/ReaderWriter/Reader.h b/lld/include/lld/ReaderWriter/Reader.h
index 2d276c0..35c0ebd 100644
--- a/lld/include/lld/ReaderWriter/Reader.h
+++ b/lld/include/lld/ReaderWriter/Reader.h
@@ -14,7 +14,6 @@
#include "lld/Core/Reference.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/YAMLTraits.h"
-
#include <functional>
#include <memory>
#include <vector>
diff --git a/lld/include/lld/ReaderWriter/Writer.h b/lld/include/lld/ReaderWriter/Writer.h
index 35ff79e..c50a2ae 100644
--- a/lld/include/lld/ReaderWriter/Writer.h
+++ b/lld/include/lld/ReaderWriter/Writer.h
@@ -11,7 +11,6 @@
#define LLD_READER_WRITER_WRITER_H
#include "lld/Core/LLVM.h"
-
#include <memory>
#include <vector>
diff --git a/lld/include/lld/ReaderWriter/YamlContext.h b/lld/include/lld/ReaderWriter/YamlContext.h
index 9d01ea1..a15a398 100644
--- a/lld/include/lld/ReaderWriter/YamlContext.h
+++ b/lld/include/lld/ReaderWriter/YamlContext.h
@@ -11,7 +11,6 @@
#define LLD_READER_WRITER_YAML_CONTEXT_H
#include "lld/Core/LLVM.h"
-
#include <functional>
#include <memory>
#include <vector>
diff --git a/lld/lib/Core/DefinedAtom.cpp b/lld/lib/Core/DefinedAtom.cpp
index f000f74..6b9a08a 100644
--- a/lld/lib/Core/DefinedAtom.cpp
+++ b/lld/lib/Core/DefinedAtom.cpp
@@ -8,7 +8,6 @@
//===----------------------------------------------------------------------===//
#include "llvm/Support/ErrorHandling.h"
-
#include "lld/Core/DefinedAtom.h"
diff --git a/lld/lib/Core/Error.cpp b/lld/lib/Core/Error.cpp
index a76e33b..cba2389 100644
--- a/lld/lib/Core/Error.cpp
+++ b/lld/lib/Core/Error.cpp
@@ -8,11 +8,9 @@
//===----------------------------------------------------------------------===//
#include "lld/Core/Error.h"
-
#include "llvm/ADT/Twine.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/Mutex.h"
-
#include <string>
#include <vector>
diff --git a/lld/lib/Core/InputGraph.cpp b/lld/lib/Core/InputGraph.cpp
index bdef8c3..f4f5e5a 100644
--- a/lld/lib/Core/InputGraph.cpp
+++ b/lld/lib/Core/InputGraph.cpp
@@ -8,9 +8,7 @@
//===----------------------------------------------------------------------===//
#include "lld/Core/InputGraph.h"
-
#include "lld/Core/Resolver.h"
-
#include <memory>
using namespace lld;
diff --git a/lld/lib/Core/Resolver.cpp b/lld/lib/Core/Resolver.cpp
index 417442d..1657866 100644
--- a/lld/lib/Core/Resolver.cpp
+++ b/lld/lib/Core/Resolver.cpp
@@ -10,19 +10,17 @@
#include "lld/Core/Atom.h"
#include "lld/Core/ArchiveLibraryFile.h"
#include "lld/Core/File.h"
-#include "lld/Core/SharedLibraryFile.h"
#include "lld/Core/Instrumentation.h"
#include "lld/Core/LLVM.h"
-#include "lld/Core/Resolver.h"
-#include "lld/Core/SymbolTable.h"
#include "lld/Core/LinkingContext.h"
+#include "lld/Core/Resolver.h"
+#include "lld/Core/SharedLibraryFile.h"
+#include "lld/Core/SymbolTable.h"
#include "lld/Core/UndefinedAtom.h"
-
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/raw_ostream.h"
-
#include <algorithm>
#include <cassert>
#include <vector>
diff --git a/lld/lib/Core/SymbolTable.cpp b/lld/lib/Core/SymbolTable.cpp
index 477c7cb..d9cc868 100644
--- a/lld/lib/Core/SymbolTable.cpp
+++ b/lld/lib/Core/SymbolTable.cpp
@@ -13,17 +13,15 @@
#include "lld/Core/DefinedAtom.h"
#include "lld/Core/File.h"
#include "lld/Core/LLVM.h"
+#include "lld/Core/LinkingContext.h"
#include "lld/Core/Resolver.h"
#include "lld/Core/SharedLibraryAtom.h"
-#include "lld/Core/LinkingContext.h"
#include "lld/Core/UndefinedAtom.h"
-
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/DenseMapInfo.h"
#include "llvm/ADT/Hashing.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h"
-
#include <algorithm>
#include <cassert>
#include <cstdlib>
diff --git a/lld/lib/Driver/CoreDriver.cpp b/lld/lib/Driver/CoreDriver.cpp
index 2aa9e47..07af587 100644
--- a/lld/lib/Driver/CoreDriver.cpp
+++ b/lld/lib/Driver/CoreDriver.cpp
@@ -11,7 +11,6 @@
#include "lld/Driver/CoreInputGraph.h"
#include "lld/ReaderWriter/CoreLinkingContext.h"
#include "lld/ReaderWriter/Reader.h"
-
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/Triple.h"
@@ -23,8 +22,8 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Signals.h"
+#include "llvm/Support/raw_ostream.h"
using namespace lld;
diff --git a/lld/lib/Driver/DarwinInputGraph.cpp b/lld/lib/Driver/DarwinInputGraph.cpp
index f71afb0..ef246b6 100644
--- a/lld/lib/Driver/DarwinInputGraph.cpp
+++ b/lld/lib/Driver/DarwinInputGraph.cpp
@@ -8,7 +8,6 @@
//===----------------------------------------------------------------------===//
#include "lld/Driver/DarwinInputGraph.h"
-
#include "lld/Core/ArchiveLibraryFile.h"
#include "lld/Core/DefinedAtom.h"
#include "lld/Core/File.h"
diff --git a/lld/lib/Driver/DarwinLdDriver.cpp b/lld/lib/Driver/DarwinLdDriver.cpp
index 41cec56..e7ffcd8 100644
--- a/lld/lib/Driver/DarwinLdDriver.cpp
+++ b/lld/lib/Driver/DarwinLdDriver.cpp
@@ -29,9 +29,8 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Signals.h"
-
+#include "llvm/Support/raw_ostream.h"
#include <algorithm>
using namespace lld;
diff --git a/lld/lib/Driver/Driver.cpp b/lld/lib/Driver/Driver.cpp
index 9e57ed7..1095051 100644
--- a/lld/lib/Driver/Driver.cpp
+++ b/lld/lib/Driver/Driver.cpp
@@ -8,17 +8,15 @@
//===----------------------------------------------------------------------===//
#include "lld/Driver/Driver.h"
-
-#include "lld/Core/LLVM.h"
#include "lld/Core/Instrumentation.h"
-#include "lld/Core/PassManager.h"
+#include "lld/Core/LLVM.h"
#include "lld/Core/Parallel.h"
+#include "lld/Core/PassManager.h"
#include "lld/Core/Resolver.h"
-#include "lld/ReaderWriter/Reader.h"
-#include "lld/ReaderWriter/Writer.h"
#include "lld/Passes/RoundTripNativePass.h"
#include "lld/Passes/RoundTripYAMLPass.h"
-
+#include "lld/ReaderWriter/Reader.h"
+#include "lld/ReaderWriter/Writer.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/Option/Arg.h"
@@ -27,7 +25,6 @@
#include "llvm/Support/Path.h"
#include "llvm/Support/Process.h"
#include "llvm/Support/raw_ostream.h"
-
#include <mutex>
namespace lld {
diff --git a/lld/lib/Driver/GnuLdDriver.cpp b/lld/lib/Driver/GnuLdDriver.cpp
index ded0b70..0d2dea3 100644
--- a/lld/lib/Driver/GnuLdDriver.cpp
+++ b/lld/lib/Driver/GnuLdDriver.cpp
@@ -15,7 +15,6 @@
#include "lld/Driver/Driver.h"
#include "lld/Driver/GnuLdInputGraph.h"
-
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/STLExtras.h"
@@ -30,9 +29,8 @@
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/PrettyStackTrace.h"
-#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/Signals.h"
-
+#include "llvm/Support/raw_ostream.h"
#include <cstring>
#include <tuple>
diff --git a/lld/lib/Driver/GnuLdInputGraph.cpp b/lld/lib/Driver/GnuLdInputGraph.cpp
index ac85565..6fd1ebd 100644
--- a/lld/lib/Driver/GnuLdInputGraph.cpp
+++ b/lld/lib/Driver/GnuLdInputGraph.cpp
@@ -9,7 +9,6 @@
#include "lld/Driver/GnuLdInputGraph.h"
#include "lld/ReaderWriter/LinkerScript.h"
-
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
diff --git a/lld/lib/Driver/UniversalDriver.cpp b/lld/lib/Driver/UniversalDriver.cpp
index 478dd1e..7d42ad7 100644
--- a/lld/lib/Driver/UniversalDriver.cpp
+++ b/lld/lib/Driver/UniversalDriver.cpp
@@ -16,9 +16,7 @@
#include "lld/Driver/Driver.h"
#include "lld/Config/Version.h"
-
#include "lld/Core/LLVM.h"
-
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/StringSwitch.h"
diff --git a/lld/lib/Driver/WinLinkDriver.cpp b/lld/lib/Driver/WinLinkDriver.cpp
index cdd9af1..5da15eb 100644
--- a/lld/lib/Driver/WinLinkDriver.cpp
+++ b/lld/lib/Driver/WinLinkDriver.cpp
@@ -17,7 +17,6 @@
#include "lld/Driver/WinLinkInputGraph.h"
#include "lld/Driver/WinLinkModuleDef.h"
#include "lld/ReaderWriter/PECOFFLinkingContext.h"
-
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/Optional.h"
#include "llvm/ADT/STLExtras.h"
@@ -32,7 +31,6 @@
#include "llvm/Support/Process.h"
#include "llvm/Support/Program.h"
#include "llvm/Support/raw_ostream.h"
-
#include <algorithm>
#include <cctype>
#include <map>
diff --git a/lld/lib/Passes/LayoutPass.cpp b/lld/lib/Passes/LayoutPass.cpp
index 63ed4ee..cb6d082 100644
--- a/lld/lib/Passes/LayoutPass.cpp
+++ b/lld/lib/Passes/LayoutPass.cpp
@@ -7,14 +7,12 @@
//
//===----------------------------------------------------------------------===//
-#include <algorithm>
-#include <set>
-
#include "lld/Passes/LayoutPass.h"
#include "lld/Core/Instrumentation.h"
-
#include "llvm/ADT/Twine.h"
#include "llvm/Support/Debug.h"
+#include <algorithm>
+#include <set>
using namespace lld;
diff --git a/lld/lib/Passes/RoundTripNativePass.cpp b/lld/lib/Passes/RoundTripNativePass.cpp
index 977fcab..96f3cf5 100644
--- a/lld/lib/Passes/RoundTripNativePass.cpp
+++ b/lld/lib/Passes/RoundTripNativePass.cpp
@@ -11,10 +11,8 @@
#include "lld/Core/Simple.h"
#include "lld/Passes/RoundTripNativePass.h"
#include "lld/ReaderWriter/Writer.h"
-
#include "llvm/Support/Debug.h"
#include "llvm/Support/Path.h"
-
#include <memory>
using namespace lld;
diff --git a/lld/lib/Passes/RoundTripYAMLPass.cpp b/lld/lib/Passes/RoundTripYAMLPass.cpp
index d96341f..7aab824 100644
--- a/lld/lib/Passes/RoundTripYAMLPass.cpp
+++ b/lld/lib/Passes/RoundTripYAMLPass.cpp
@@ -11,10 +11,8 @@
#include "lld/Core/Simple.h"
#include "lld/Passes/RoundTripYAMLPass.h"
#include "lld/ReaderWriter/Writer.h"
-
#include "llvm/Support/Debug.h"
#include "llvm/Support/Path.h"
-
#include <memory>
using namespace lld;
diff --git a/lld/lib/ReaderWriter/CoreLinkingContext.cpp b/lld/lib/ReaderWriter/CoreLinkingContext.cpp
index 9fd97ed..ba2ee20 100644
--- a/lld/lib/ReaderWriter/CoreLinkingContext.cpp
+++ b/lld/lib/ReaderWriter/CoreLinkingContext.cpp
@@ -8,13 +8,11 @@
//===----------------------------------------------------------------------===//
#include "lld/ReaderWriter/CoreLinkingContext.h"
-
#include "lld/Core/Pass.h"
#include "lld/Core/PassManager.h"
#include "lld/Core/Simple.h"
#include "lld/Passes/LayoutPass.h"
#include "lld/Passes/RoundTripYAMLPass.h"
-
#include "llvm/ADT/ArrayRef.h"
using namespace lld;
diff --git a/lld/lib/ReaderWriter/ELF/Mips/MipsELFWriters.h b/lld/lib/ReaderWriter/ELF/Mips/MipsELFWriters.h
index d4872a0..3b8a397 100644
--- a/lld/lib/ReaderWriter/ELF/Mips/MipsELFWriters.h
+++ b/lld/lib/ReaderWriter/ELF/Mips/MipsELFWriters.h
@@ -10,7 +10,6 @@
#define LLD_READER_WRITER_ELF_MIPS_MIPS_ELF_WRITERS_H
#include "MipsLinkingContext.h"
-
#include "OutputELFWriter.h"
namespace lld {
diff --git a/lld/lib/ReaderWriter/FileArchive.cpp b/lld/lib/ReaderWriter/FileArchive.cpp
index ca2aaf3..2e34b1b 100644
--- a/lld/lib/ReaderWriter/FileArchive.cpp
+++ b/lld/lib/ReaderWriter/FileArchive.cpp
@@ -9,7 +9,6 @@
#include "lld/Core/ArchiveLibraryFile.h"
#include "lld/Core/LLVM.h"
-
#include "llvm/ADT/Hashing.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Object/Archive.h"
@@ -17,7 +16,6 @@
#include "llvm/Support/Debug.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/MemoryBuffer.h"
-
#include <memory>
#include <set>
#include <unordered_map>
diff --git a/lld/lib/ReaderWriter/MachO/ArchHandler.cpp b/lld/lib/ReaderWriter/MachO/ArchHandler.cpp
index 3ccb171..d6a34c7 100644
--- a/lld/lib/ReaderWriter/MachO/ArchHandler.cpp
+++ b/lld/lib/ReaderWriter/MachO/ArchHandler.cpp
@@ -11,11 +11,9 @@
#include "ArchHandler.h"
#include "Atoms.h"
#include "MachONormalizedFileBinaryUtils.h"
-
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/ADT/Triple.h"
-
#include "llvm/Support/ErrorHandling.h"
using namespace llvm::MachO;
diff --git a/lld/lib/ReaderWriter/MachO/ArchHandler.h b/lld/lib/ReaderWriter/MachO/ArchHandler.h
index 9613f7a..2f4a3cb 100644
--- a/lld/lib/ReaderWriter/MachO/ArchHandler.h
+++ b/lld/lib/ReaderWriter/MachO/ArchHandler.h
@@ -7,15 +7,13 @@
//
//===----------------------------------------------------------------------===//
-#include "MachONormalizedFile.h"
#include "Atoms.h"
#include "File.h"
-
+#include "MachONormalizedFile.h"
#include "lld/Core/LLVM.h"
#include "lld/Core/Reference.h"
#include "lld/Core/Simple.h"
#include "lld/ReaderWriter/MachOLinkingContext.h"
-
#include "llvm/ADT/Triple.h"
#ifndef LLD_READER_WRITER_MACHO_ARCH_HANDLER_H
diff --git a/lld/lib/ReaderWriter/MachO/ArchHandler_arm.cpp b/lld/lib/ReaderWriter/MachO/ArchHandler_arm.cpp
index 8a81209..64d3fbe 100644
--- a/lld/lib/ReaderWriter/MachO/ArchHandler_arm.cpp
+++ b/lld/lib/ReaderWriter/MachO/ArchHandler_arm.cpp
@@ -10,11 +10,9 @@
#include "ArchHandler.h"
#include "Atoms.h"
#include "MachONormalizedFileBinaryUtils.h"
-
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/ADT/Triple.h"
-
#include "llvm/Support/ErrorHandling.h"
using namespace llvm::MachO;
diff --git a/lld/lib/ReaderWriter/MachO/ArchHandler_arm64.cpp b/lld/lib/ReaderWriter/MachO/ArchHandler_arm64.cpp
index efa649c..c70ee8e 100644
--- a/lld/lib/ReaderWriter/MachO/ArchHandler_arm64.cpp
+++ b/lld/lib/ReaderWriter/MachO/ArchHandler_arm64.cpp
@@ -10,11 +10,9 @@
#include "ArchHandler.h"
#include "Atoms.h"
#include "MachONormalizedFileBinaryUtils.h"
-
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/ADT/Triple.h"
-
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/Format.h"
diff --git a/lld/lib/ReaderWriter/MachO/ArchHandler_x86.cpp b/lld/lib/ReaderWriter/MachO/ArchHandler_x86.cpp
index b466709..abc8d79 100644
--- a/lld/lib/ReaderWriter/MachO/ArchHandler_x86.cpp
+++ b/lld/lib/ReaderWriter/MachO/ArchHandler_x86.cpp
@@ -10,11 +10,9 @@
#include "ArchHandler.h"
#include "Atoms.h"
#include "MachONormalizedFileBinaryUtils.h"
-
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/ADT/Triple.h"
-
#include "llvm/Support/ErrorHandling.h"
using namespace llvm::MachO;
diff --git a/lld/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp b/lld/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp
index 4b3c124..193b3e8 100644
--- a/lld/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp
+++ b/lld/lib/ReaderWriter/MachO/ArchHandler_x86_64.cpp
@@ -10,11 +10,9 @@
#include "ArchHandler.h"
#include "Atoms.h"
#include "MachONormalizedFileBinaryUtils.h"
-
#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSwitch.h"
#include "llvm/ADT/Triple.h"
-
#include "llvm/Support/ErrorHandling.h"
using namespace llvm::MachO;
diff --git a/lld/lib/ReaderWriter/MachO/CompactUnwindPass.cpp b/lld/lib/ReaderWriter/MachO/CompactUnwindPass.cpp
index 3a8bf1f..d642a99 100644
--- a/lld/lib/ReaderWriter/MachO/CompactUnwindPass.cpp
+++ b/lld/lib/ReaderWriter/MachO/CompactUnwindPass.cpp
@@ -15,15 +15,13 @@
#include "ArchHandler.h"
#include "File.h"
-#include "MachOPasses.h"
#include "MachONormalizedFileBinaryUtils.h"
-
+#include "MachOPasses.h"
#include "lld/Core/DefinedAtom.h"
#include "lld/Core/File.h"
#include "lld/Core/LLVM.h"
#include "lld/Core/Reference.h"
#include "lld/Core/Simple.h"
-
#include "llvm/ADT/DenseMap.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/Endian.h"
diff --git a/lld/lib/ReaderWriter/MachO/File.h b/lld/lib/ReaderWriter/MachO/File.h
index 8bdce17..cc832e4 100644
--- a/lld/lib/ReaderWriter/MachO/File.h
+++ b/lld/lib/ReaderWriter/MachO/File.h
@@ -12,12 +12,9 @@
#include "Atoms.h"
#include "MachONormalizedFile.h"
-
-#include "lld/Core/Simple.h"
#include "lld/Core/SharedLibraryFile.h"
-
+#include "lld/Core/Simple.h"
#include "llvm/ADT/StringMap.h"
-
#include <unordered_map>
namespace lld {
diff --git a/lld/lib/ReaderWriter/MachO/GOTPass.cpp b/lld/lib/ReaderWriter/MachO/GOTPass.cpp
index d55026a..b86160e 100644
--- a/lld/lib/ReaderWriter/MachO/GOTPass.cpp
+++ b/lld/lib/ReaderWriter/MachO/GOTPass.cpp
@@ -35,13 +35,11 @@
#include "ArchHandler.h"
#include "File.h"
#include "MachOPasses.h"
-
#include "lld/Core/DefinedAtom.h"
#include "lld/Core/File.h"
#include "lld/Core/LLVM.h"
#include "lld/Core/Reference.h"
#include "lld/Core/Simple.h"
-
#include "llvm/ADT/DenseMap.h"
diff --git a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
index f23bfc8..9c0736d 100644
--- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
@@ -8,19 +8,16 @@
//===----------------------------------------------------------------------===//
#include "lld/ReaderWriter/MachOLinkingContext.h"
-
#include "ArchHandler.h"
#include "File.h"
#include "MachONormalizedFile.h"
#include "MachOPasses.h"
-
#include "lld/Core/PassManager.h"
#include "lld/Driver/DarwinInputGraph.h"
-#include "lld/ReaderWriter/Reader.h"
-#include "lld/ReaderWriter/Writer.h"
#include "lld/Passes/LayoutPass.h"
#include "lld/Passes/RoundTripYAMLPass.h"
-
+#include "lld/ReaderWriter/Reader.h"
+#include "lld/ReaderWriter/Writer.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/Triple.h"
#include "llvm/Config/config.h"
@@ -28,7 +25,6 @@
#include "llvm/Support/Host.h"
#include "llvm/Support/MachO.h"
#include "llvm/Support/Path.h"
-
#include <algorithm>
#if HAVE_CXXABI_H
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h b/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
index e5c3440..29d2fc8 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
@@ -42,7 +42,6 @@
#include "lld/Core/Error.h"
#include "lld/Core/LLVM.h"
#include "lld/ReaderWriter/MachOLinkingContext.h"
-
#include "llvm/ADT/SmallString.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Allocator.h"
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
index 0993ea5..efd507f 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryReader.cpp
@@ -22,10 +22,8 @@
/// +------------+
#include "MachONormalizedFile.h"
-
#include "ArchHandler.h"
#include "MachONormalizedFileBinaryUtils.h"
-
#include "lld/Core/Error.h"
#include "lld/Core/LLVM.h"
#include "lld/Core/SharedLibraryFile.h"
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
index 531479de..208ef0b 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryWriter.cpp
@@ -29,8 +29,8 @@
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Casting.h"
-#include "llvm/Support/Errc.h"
#include "llvm/Support/Debug.h"
+#include "llvm/Support/Errc.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FileOutputBuffer.h"
#include "llvm/Support/Format.h"
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
index d3ee9f0..c420aa6 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
@@ -21,10 +21,8 @@
/// +-------+
#include "MachONormalizedFile.h"
-
#include "ArchHandler.h"
#include "MachONormalizedFileBinaryUtils.h"
-
#include "lld/Core/Error.h"
#include "lld/Core/LLVM.h"
#include "llvm/ADT/StringRef.h"
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp b/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
index d053690..3875c62 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileToAtoms.cpp
@@ -21,17 +21,14 @@
/// +-------+
#include "MachONormalizedFile.h"
-
#include "ArchHandler.h"
#include "Atoms.h"
#include "File.h"
#include "MachONormalizedFileBinaryUtils.h"
-
#include "lld/Core/Error.h"
#include "lld/Core/LLVM.h"
-
-#include "llvm/Support/MachO.h"
#include "llvm/Support/Format.h"
+#include "llvm/Support/MachO.h"
using namespace llvm::MachO;
using namespace lld::mach_o::normalized;
diff --git a/lld/lib/ReaderWriter/MachO/ShimPass.cpp b/lld/lib/ReaderWriter/MachO/ShimPass.cpp
index 9d1e9c7..59e47e6 100644
--- a/lld/lib/ReaderWriter/MachO/ShimPass.cpp
+++ b/lld/lib/ReaderWriter/MachO/ShimPass.cpp
@@ -26,14 +26,12 @@
#include "ArchHandler.h"
#include "File.h"
#include "MachOPasses.h"
-
#include "lld/Core/DefinedAtom.h"
#include "lld/Core/File.h"
#include "lld/Core/LLVM.h"
#include "lld/Core/Reference.h"
#include "lld/Core/Simple.h"
#include "lld/ReaderWriter/MachOLinkingContext.h"
-
#include "llvm/ADT/DenseMap.h"
diff --git a/lld/lib/ReaderWriter/MachO/StubsPass.cpp b/lld/lib/ReaderWriter/MachO/StubsPass.cpp
index 10bfabe..6f58b99 100644
--- a/lld/lib/ReaderWriter/MachO/StubsPass.cpp
+++ b/lld/lib/ReaderWriter/MachO/StubsPass.cpp
@@ -17,14 +17,12 @@
#include "ArchHandler.h"
#include "File.h"
#include "MachOPasses.h"
-
#include "lld/Core/DefinedAtom.h"
#include "lld/Core/File.h"
#include "lld/Core/LLVM.h"
#include "lld/Core/Reference.h"
#include "lld/Core/Simple.h"
#include "lld/ReaderWriter/MachOLinkingContext.h"
-
#include "llvm/ADT/DenseMap.h"
diff --git a/lld/lib/ReaderWriter/Native/NativeFileFormat.h b/lld/lib/ReaderWriter/Native/NativeFileFormat.h
index 0f58e0a..e595bcd 100644
--- a/lld/lib/ReaderWriter/Native/NativeFileFormat.h
+++ b/lld/lib/ReaderWriter/Native/NativeFileFormat.h
@@ -10,9 +10,8 @@
#ifndef LLD_READER_WRITER_NATIVE_NATIVE_FILE_FORMAT_H
#define LLD_READER_WRITER_NATIVE_NATIVE_FILE_FORMAT_H
-#include <cstdint>
-
#include "llvm/Support/DataTypes.h"
+#include <cstdint>
namespace lld {
diff --git a/lld/lib/ReaderWriter/Native/ReaderNative.cpp b/lld/lib/ReaderWriter/Native/ReaderNative.cpp
index 48bf912..62bb9a1 100644
--- a/lld/lib/ReaderWriter/Native/ReaderNative.cpp
+++ b/lld/lib/ReaderWriter/Native/ReaderNative.cpp
@@ -8,13 +8,11 @@
//===----------------------------------------------------------------------===//
#include "NativeFileFormat.h"
-
#include "lld/Core/Atom.h"
#include "lld/Core/Error.h"
#include "lld/Core/File.h"
#include "lld/Core/Simple.h"
#include "lld/ReaderWriter/Reader.h"
-
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Debug.h"
@@ -22,7 +20,6 @@
#include "llvm/Support/Format.h"
#include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/raw_ostream.h"
-
#include <memory>
#include <vector>
diff --git a/lld/lib/ReaderWriter/PECOFF/Atoms.h b/lld/lib/ReaderWriter/PECOFF/Atoms.h
index 4f96c79..7c4d433 100644
--- a/lld/lib/ReaderWriter/PECOFF/Atoms.h
+++ b/lld/lib/ReaderWriter/PECOFF/Atoms.h
@@ -14,7 +14,6 @@
#include "lld/Core/Simple.h"
#include "llvm/ADT/ArrayRef.h"
#include "llvm/Object/COFF.h"
-
#include <vector>
namespace lld {
diff --git a/lld/lib/ReaderWriter/PECOFF/EdataPass.cpp b/lld/lib/ReaderWriter/PECOFF/EdataPass.cpp
index 73449f0..01339d1 100644
--- a/lld/lib/ReaderWriter/PECOFF/EdataPass.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/EdataPass.cpp
@@ -9,13 +9,11 @@
#include "Pass.h"
#include "EdataPass.h"
-
#include "lld/Core/File.h"
#include "lld/Core/Pass.h"
#include "lld/Core/Simple.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/Path.h"
-
#include <climits>
#include <ctime>
#include <utility>
diff --git a/lld/lib/ReaderWriter/PECOFF/EdataPass.h b/lld/lib/ReaderWriter/PECOFF/EdataPass.h
index 178b3c6..6f76c96 100644
--- a/lld/lib/ReaderWriter/PECOFF/EdataPass.h
+++ b/lld/lib/ReaderWriter/PECOFF/EdataPass.h
@@ -20,13 +20,11 @@
#define LLD_READER_WRITER_PE_COFF_EDATA_PASS_H
#include "Atoms.h"
-
#include "lld/Core/File.h"
#include "lld/Core/Pass.h"
#include "lld/Core/Simple.h"
#include "lld/ReaderWriter/PECOFFLinkingContext.h"
#include "llvm/Support/COFF.h"
-
#include <map>
using llvm::COFF::ImportDirectoryTableEntry;
diff --git a/lld/lib/ReaderWriter/PECOFF/GroupedSectionsPass.h b/lld/lib/ReaderWriter/PECOFF/GroupedSectionsPass.h
index f5c2231..ab902ef 100644
--- a/lld/lib/ReaderWriter/PECOFF/GroupedSectionsPass.h
+++ b/lld/lib/ReaderWriter/PECOFF/GroupedSectionsPass.h
@@ -31,7 +31,6 @@
#include "Atoms.h"
#include "lld/Core/Pass.h"
-
#include <algorithm>
namespace lld {
diff --git a/lld/lib/ReaderWriter/PECOFF/IdataPass.cpp b/lld/lib/ReaderWriter/PECOFF/IdataPass.cpp
index 538387a..925a262 100644
--- a/lld/lib/ReaderWriter/PECOFF/IdataPass.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/IdataPass.cpp
@@ -9,14 +9,12 @@
#include "IdataPass.h"
#include "Pass.h"
-
#include "lld/Core/File.h"
#include "lld/Core/Pass.h"
#include "lld/Core/Simple.h"
#include "llvm/Support/COFF.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/Endian.h"
-
#include <algorithm>
#include <cstddef>
#include <cstring>
diff --git a/lld/lib/ReaderWriter/PECOFF/IdataPass.h b/lld/lib/ReaderWriter/PECOFF/IdataPass.h
index 3616df0..1436341 100644
--- a/lld/lib/ReaderWriter/PECOFF/IdataPass.h
+++ b/lld/lib/ReaderWriter/PECOFF/IdataPass.h
@@ -20,13 +20,11 @@
#define LLD_READER_WRITER_PE_COFF_IDATA_PASS_H
#include "Atoms.h"
-
#include "lld/Core/File.h"
#include "lld/Core/Pass.h"
#include "lld/Core/Simple.h"
#include "lld/ReaderWriter/PECOFFLinkingContext.h"
#include "llvm/Support/COFF.h"
-
#include <algorithm>
#include <map>
diff --git a/lld/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h b/lld/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h
index 4a667db..0c44037 100644
--- a/lld/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h
+++ b/lld/lib/ReaderWriter/PECOFF/LinkerGeneratedSymbolFile.h
@@ -8,12 +8,10 @@
//===----------------------------------------------------------------------===//
#include "Atoms.h"
-
#include "lld/Core/ArchiveLibraryFile.h"
#include "lld/Core/Simple.h"
#include "lld/ReaderWriter/PECOFFLinkingContext.h"
#include "llvm/Support/Allocator.h"
-
#include <mutex>
using llvm::COFF::WindowsSubsystem;
diff --git a/lld/lib/ReaderWriter/PECOFF/LoadConfigPass.cpp b/lld/lib/ReaderWriter/PECOFF/LoadConfigPass.cpp
index 9dbe13d..be2f5627 100644
--- a/lld/lib/ReaderWriter/PECOFF/LoadConfigPass.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/LoadConfigPass.cpp
@@ -19,14 +19,12 @@
#include "Pass.h"
#include "LoadConfigPass.h"
-
#include "lld/Core/File.h"
#include "lld/Core/Pass.h"
#include "lld/Core/Simple.h"
#include "llvm/Object/COFF.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/Path.h"
-
#include <climits>
#include <ctime>
#include <utility>
diff --git a/lld/lib/ReaderWriter/PECOFF/LoadConfigPass.h b/lld/lib/ReaderWriter/PECOFF/LoadConfigPass.h
index 4ff0a8c..534d956 100644
--- a/lld/lib/ReaderWriter/PECOFF/LoadConfigPass.h
+++ b/lld/lib/ReaderWriter/PECOFF/LoadConfigPass.h
@@ -19,12 +19,10 @@
#define LLD_READER_WRITER_PE_COFF_LOAD_CONFIG_PASS_H
#include "Atoms.h"
-
#include "lld/Core/File.h"
#include "lld/Core/Pass.h"
#include "lld/Core/Simple.h"
#include "lld/ReaderWriter/PECOFFLinkingContext.h"
-
#include <map>
namespace lld {
diff --git a/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp b/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp
index c971b78..6a24419 100644
--- a/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/PECOFFLinkingContext.cpp
@@ -13,7 +13,6 @@
#include "IdataPass.h"
#include "LinkerGeneratedSymbolFile.h"
#include "LoadConfigPass.h"
-
#include "lld/Core/PassManager.h"
#include "lld/Core/Simple.h"
#include "lld/Passes/LayoutPass.h"
@@ -25,7 +24,6 @@
#include "llvm/ADT/SmallString.h"
#include "llvm/Support/Allocator.h"
#include "llvm/Support/Path.h"
-
#include <bitset>
#include <climits>
#include <set>
diff --git a/lld/lib/ReaderWriter/PECOFF/Pass.cpp b/lld/lib/ReaderWriter/PECOFF/Pass.cpp
index 255eebd..ed7a8a4 100644
--- a/lld/lib/ReaderWriter/PECOFF/Pass.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/Pass.cpp
@@ -9,7 +9,6 @@
#include "Atoms.h"
#include "Pass.h"
-
#include "lld/Core/File.h"
#include "llvm/Support/COFF.h"
diff --git a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
index 6c24197..1fb3291 100644
--- a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
@@ -21,13 +21,11 @@
#include "Atoms.h"
#include "WriterImportLibrary.h"
-
#include "lld/Core/DefinedAtom.h"
#include "lld/Core/File.h"
#include "lld/ReaderWriter/AtomLayout.h"
#include "lld/ReaderWriter/PECOFFLinkingContext.h"
#include "lld/ReaderWriter/Writer.h"
-
#include "llvm/ADT/ArrayRef.h"
#include "llvm/Object/COFF.h"
#include "llvm/Support/COFF.h"
@@ -37,7 +35,6 @@
#include "llvm/Support/ErrorOr.h"
#include "llvm/Support/FileOutputBuffer.h"
#include "llvm/Support/Format.h"
-
#include <algorithm>
#include <cstdlib>
#include <map>
diff --git a/lld/tools/lld/lld.cpp b/lld/tools/lld/lld.cpp
index 171c018..24c3a66 100644
--- a/lld/tools/lld/lld.cpp
+++ b/lld/tools/lld/lld.cpp
@@ -16,7 +16,6 @@
#include "lld/Core/LLVM.h"
#include "lld/Driver/Driver.h"
-
#include "llvm/Support/ManagedStatic.h"
#include "llvm/Support/PrettyStackTrace.h"
#include "llvm/Support/Signals.h"
diff --git a/lld/unittests/CoreTests/ParallelTest.cpp b/lld/unittests/CoreTests/ParallelTest.cpp
index ffa2b23..c028243 100644
--- a/lld/unittests/CoreTests/ParallelTest.cpp
+++ b/lld/unittests/CoreTests/ParallelTest.cpp
@@ -13,9 +13,7 @@
//===----------------------------------------------------------------------===//
#include "gtest/gtest.h"
-
#include "lld/Core/Parallel.h"
-
#include <array>
#include <random>
diff --git a/lld/unittests/CoreTests/RangeTest.cpp b/lld/unittests/CoreTests/RangeTest.cpp
index 18147ef..d1372ab 100644
--- a/lld/unittests/CoreTests/RangeTest.cpp
+++ b/lld/unittests/CoreTests/RangeTest.cpp
@@ -13,11 +13,9 @@
//===----------------------------------------------------------------------===//
#include "gtest/gtest.h"
-
#include "lld/Core/range.h"
-
-#include <assert.h>
#include <array>
+#include <assert.h>
#include <deque>
#include <forward_list>
#include <iterator>
diff --git a/lld/unittests/DriverTests/DarwinLdDriverTest.cpp b/lld/unittests/DriverTests/DarwinLdDriverTest.cpp
index c159fd8..87200ec 100644
--- a/lld/unittests/DriverTests/DarwinLdDriverTest.cpp
+++ b/lld/unittests/DriverTests/DarwinLdDriverTest.cpp
@@ -13,10 +13,8 @@
//===----------------------------------------------------------------------===//
#include "DriverTest.h"
-
-#include "llvm/Support/MachO.h"
-
#include "lld/ReaderWriter/MachOLinkingContext.h"
+#include "llvm/Support/MachO.h"
using namespace llvm;
using namespace lld;
diff --git a/lld/unittests/DriverTests/DriverTest.h b/lld/unittests/DriverTests/DriverTest.h
index 36f3995..b0e02d3 100644
--- a/lld/unittests/DriverTests/DriverTest.h
+++ b/lld/unittests/DriverTests/DriverTest.h
@@ -7,13 +7,10 @@
//
//===----------------------------------------------------------------------===//
-#include <stdarg.h>
-
-#include "gtest/gtest.h"
-
#include "lld/Driver/Driver.h"
-
#include "llvm/Support/raw_ostream.h"
+#include "gtest/gtest.h"
+#include <stdarg.h>
namespace {
diff --git a/lld/unittests/DriverTests/GnuLdDriverTest.cpp b/lld/unittests/DriverTests/GnuLdDriverTest.cpp
index f86ad59..34ad942 100644
--- a/lld/unittests/DriverTests/GnuLdDriverTest.cpp
+++ b/lld/unittests/DriverTests/GnuLdDriverTest.cpp
@@ -13,7 +13,6 @@
//===----------------------------------------------------------------------===//
#include "DriverTest.h"
-
#include "lld/ReaderWriter/ELFLinkingContext.h"
using namespace llvm;
diff --git a/lld/unittests/DriverTests/InputGraphTest.cpp b/lld/unittests/DriverTests/InputGraphTest.cpp
index 42dfe25..abbbb36 100644
--- a/lld/unittests/DriverTests/InputGraphTest.cpp
+++ b/lld/unittests/DriverTests/InputGraphTest.cpp
@@ -13,7 +13,6 @@
//===----------------------------------------------------------------------===//
#include "gtest/gtest.h"
-
#include "lld/Core/InputGraph.h"
#include "lld/Core/Resolver.h"
#include "lld/Core/Simple.h"
diff --git a/lld/unittests/DriverTests/UniversalDriverTest.cpp b/lld/unittests/DriverTests/UniversalDriverTest.cpp
index efa9d33..8e90ca4 100644
--- a/lld/unittests/DriverTests/UniversalDriverTest.cpp
+++ b/lld/unittests/DriverTests/UniversalDriverTest.cpp
@@ -13,9 +13,7 @@
//===----------------------------------------------------------------------===//
#include "gtest/gtest.h"
-
#include "lld/Driver/Driver.h"
-
#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/lld/unittests/DriverTests/WinLinkDriverTest.cpp b/lld/unittests/DriverTests/WinLinkDriverTest.cpp
index dde4e13..c83f568 100644
--- a/lld/unittests/DriverTests/WinLinkDriverTest.cpp
+++ b/lld/unittests/DriverTests/WinLinkDriverTest.cpp
@@ -13,11 +13,9 @@
//===----------------------------------------------------------------------===//
#include "DriverTest.h"
-
#include "lld/ReaderWriter/PECOFFLinkingContext.h"
#include "llvm/ADT/Optional.h"
#include "llvm/Support/COFF.h"
-
#include <set>
#include <vector>
diff --git a/lld/unittests/DriverTests/WinLinkModuleDefTest.cpp b/lld/unittests/DriverTests/WinLinkModuleDefTest.cpp
index 36c0505..6762fd4 100644
--- a/lld/unittests/DriverTests/WinLinkModuleDefTest.cpp
+++ b/lld/unittests/DriverTests/WinLinkModuleDefTest.cpp
@@ -7,11 +7,10 @@
//
//===----------------------------------------------------------------------===//
-#include <memory>
-
#include "gtest/gtest.h"
#include "lld/Driver/WinLinkModuleDef.h"
#include "llvm/Support/MemoryBuffer.h"
+#include <memory>
using namespace llvm;
using namespace lld;
diff --git a/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp
index d2502c3..b49cc1f 100644
--- a/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp
+++ b/lld/unittests/MachOTests/MachONormalizedFileBinaryReaderTests.cpp
@@ -8,10 +8,8 @@
//===----------------------------------------------------------------------===//
#include "gtest/gtest.h"
-
-#include "llvm/Support/MachO.h"
#include "../../lib/ReaderWriter/MachO/MachONormalizedFile.h"
-
+#include "llvm/Support/MachO.h"
#include <assert.h>
#include <vector>
diff --git a/lld/unittests/MachOTests/MachONormalizedFileToAtomsTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileToAtomsTests.cpp
index af5259b..16ef88a 100644
--- a/lld/unittests/MachOTests/MachONormalizedFileToAtomsTests.cpp
+++ b/lld/unittests/MachOTests/MachONormalizedFileToAtomsTests.cpp
@@ -8,10 +8,8 @@
//===----------------------------------------------------------------------===//
#include "gtest/gtest.h"
-
-#include "llvm/Support/MachO.h"
#include "../../lib/ReaderWriter/MachO/MachONormalizedFile.h"
-
+#include "llvm/Support/MachO.h"
#include <assert.h>
#include <vector>
diff --git a/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp
index 79d5603..562dae6 100644
--- a/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp
+++ b/lld/unittests/MachOTests/MachONormalizedFileYAMLTests.cpp
@@ -8,11 +8,8 @@
//===----------------------------------------------------------------------===//
#include "gtest/gtest.h"
-
-#include "llvm/Support/MachO.h"
-
#include "../../lib/ReaderWriter/MachO/MachONormalizedFile.h"
-
+#include "llvm/Support/MachO.h"
#include <assert.h>
#include <vector>