10 files changed, 25 insertions, 25 deletions
diff --git a/lld/include/lld/Driver/CoreInputGraph.h b/lld/include/lld/Driver/CoreInputGraph.h
index 0489f24dc6e..9422505b781 100644
--- a/lld/include/lld/Driver/CoreInputGraph.h
+++ b/lld/include/lld/Driver/CoreInputGraph.h
@@ -18,8 +18,8 @@
 #define LLD_DRIVER_CORE_INPUT_GRAPH_H
 
 #include "lld/Core/InputGraph.h"
-#include "lld/ReaderWriter/Reader.h"
 #include "lld/ReaderWriter/CoreLinkingContext.h"
+#include "lld/ReaderWriter/Reader.h"
 #include "llvm/ADT/OwningPtr.h"
 
 #include <map>
diff --git a/lld/include/lld/ReaderWriter/LinkerScript.h b/lld/include/lld/ReaderWriter/LinkerScript.h
index c9e9a8dafb5..7bc64af7015 100644
--- a/lld/include/lld/ReaderWriter/LinkerScript.h
+++ b/lld/include/lld/ReaderWriter/LinkerScript.h
@@ -22,8 +22,8 @@
 #include "llvm/ADT/StringSwitch.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/MemoryBuffer.h"
-#include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/SourceMgr.h"
+#include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/system_error.h"
 
 #include <vector>
diff --git a/lld/lib/Driver/WinLinkDriver.cpp b/lld/lib/Driver/WinLinkDriver.cpp
index 263f202ddc8..257a34890bb 100644
--- a/lld/lib/Driver/WinLinkDriver.cpp
+++ b/lld/lib/Driver/WinLinkDriver.cpp
@@ -13,11 +13,6 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include <algorithm>
-#include <cctype>
-#include <sstream>
-#include <map>
-
 #include "lld/Driver/Driver.h"
 #include "lld/Driver/WinLinkInputGraph.h"
 #include "lld/Driver/WinLinkModuleDef.h"
@@ -36,6 +31,11 @@
 #include "llvm/Support/Program.h"
 #include "llvm/Support/raw_ostream.h"
 
+#include <algorithm>
+#include <cctype>
+#include <map>
+#include <sstream>
+
 namespace lld {
 
 //
diff --git a/lld/lib/ReaderWriter/ELF/OutputELFWriter.h b/lld/lib/ReaderWriter/ELF/OutputELFWriter.h
index ab939b59500..f20321dcdd8 100644
--- a/lld/lib/ReaderWriter/ELF/OutputELFWriter.h
+++ b/lld/lib/ReaderWriter/ELF/OutputELFWriter.h
@@ -9,6 +9,10 @@
 #ifndef LLD_READER_WRITER_ELF_OUTPUT_WRITER_H
 #define LLD_READER_WRITER_ELF_OUTPUT_WRITER_H
 
+#include "DefaultLayout.h"
+#include "ELFFile.h"
+#include "TargetLayout.h"
+
 #include "lld/Core/Instrumentation.h"
 #include "lld/Core/Parallel.h"
 #include "lld/ReaderWriter/ELFLinkingContext.h"
@@ -16,10 +20,6 @@
 
 #include "llvm/ADT/StringSet.h"
 
-#include "DefaultLayout.h"
-#include "ELFFile.h"
-#include "TargetLayout.h"
-
 namespace lld {
 namespace elf {
 using namespace llvm;
diff --git a/lld/lib/ReaderWriter/ELF/SectionChunks.h b/lld/lib/ReaderWriter/ELF/SectionChunks.h
index c5da3cf4fab..267dbf4761c 100644
--- a/lld/lib/ReaderWriter/ELF/SectionChunks.h
+++ b/lld/lib/ReaderWriter/ELF/SectionChunks.h
@@ -20,9 +20,9 @@
 #include "lld/Core/range.h"
 
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/DenseMap.h"
 #include "llvm/Object/ELF.h"
 #include "llvm/Support/Allocator.h"
 #include "llvm/Support/Debug.h"
diff --git a/lld/lib/ReaderWriter/FileArchive.cpp b/lld/lib/ReaderWriter/FileArchive.cpp
index 8a23f7ef373..a486ffb9c93 100644
--- a/lld/lib/ReaderWriter/FileArchive.cpp
+++ b/lld/lib/ReaderWriter/FileArchive.cpp
@@ -19,8 +19,8 @@
 #include "llvm/Support/Format.h"
 #include "llvm/Support/MemoryBuffer.h"
 
-#include <unordered_map>
 #include <set>
+#include <unordered_map>
 
 using llvm::object::Archive;
 using llvm::object::ObjectFile;
diff --git a/lld/lib/ReaderWriter/Native/ReaderNative.cpp b/lld/lib/ReaderWriter/Native/ReaderNative.cpp
index be084542037..b6cd91ae0a7 100644
--- a/lld/lib/ReaderWriter/Native/ReaderNative.cpp
+++ b/lld/lib/ReaderWriter/Native/ReaderNative.cpp
@@ -7,6 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "NativeFileFormat.h"
+
 #include "lld/ReaderWriter/Reader.h"
 #include "lld/ReaderWriter/Simple.h"
 
@@ -23,10 +25,8 @@
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include "NativeFileFormat.h"
-
-#include <vector>
 #include <memory>
+#include <vector>
 
 namespace lld {
 namespace native {
diff --git a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
index a61a4556284..54686c73cd0 100644
--- a/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
+++ b/lld/lib/ReaderWriter/PECOFF/WriterPECOFF.cpp
@@ -21,12 +21,6 @@
 
 #define DEBUG_TYPE "WriterPECOFF"
 
-#include <algorithm>
-#include <cstdlib>
-#include <map>
-#include <time.h>
-#include <vector>
-
 #include "Atoms.h"
 #include "WriterImportLibrary.h"
 
@@ -46,6 +40,12 @@
 #include "llvm/Support/FileOutputBuffer.h"
 #include "llvm/Support/Format.h"
 
+#include <algorithm>
+#include <cstdlib>
+#include <map>
+#include <time.h>
+#include <vector>
+
 using llvm::COFF::DataDirectoryIndex;
 using llvm::object::coff_runtime_function_x64;
 using llvm::support::ulittle16_t;
diff --git a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
index 03a22447734..0a01d41aa95 100644
--- a/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
+++ b/lld/lib/ReaderWriter/YAML/ReaderWriterYAML.cpp
@@ -27,9 +27,9 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/MemoryBuffer.h"
+#include "llvm/Support/YAMLTraits.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/system_error.h"
-#include "llvm/Support/YAMLTraits.h"
 
 #include <string>
 
diff --git a/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp b/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
index b4c7c9e955d..6c8b6d4013a 100644
--- a/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
+++ b/lld/unittests/MachOTests/MachONormalizedFileBinaryWriterTests.cpp
@@ -9,14 +9,14 @@
 
 #include "gtest/gtest.h"
 
+#include "../../lib/ReaderWriter/MachO/MachONormalizedFile.h"
 #include <llvm/ADT/OwningPtr.h>
 #include <llvm/ADT/Twine.h>
 #include <llvm/Support/FileSystem.h>
 #include <llvm/Support/MachO.h>
 #include <llvm/Support/system_error.h>
-#include "../../lib/ReaderWriter/MachO/MachONormalizedFile.h"
 
-#include <assert.h>
+#include <cassert>
 #include <vector>
 
 using llvm::StringRef;