7 files changed, 30 insertions, 41 deletions
diff --git a/lld/lib/Core/NativeReader.cpp b/lld/lib/Core/NativeReader.cpp
index 41a2823c7b8..ffd216c97ec 100644
--- a/lld/lib/Core/NativeReader.cpp
+++ b/lld/lib/Core/NativeReader.cpp
@@ -7,9 +7,11 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <vector>
+#include "NativeFileFormat.h"
 
-#include <assert.h>
+#include "lld/Core/Atom.h"
+#include "lld/Core/Error.h"
+#include "lld/Core/File.h"
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/OwningPtr.h"
@@ -17,11 +19,7 @@
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/MemoryBuffer.h"
 
-#include "lld/Core/Error.h"
-#include "lld/Core/File.h"
-#include "lld/Core/Atom.h"
-
-#include "NativeFileFormat.h"
+#include <vector>
 
 namespace lld {
 
diff --git a/lld/lib/Core/NativeWriter.cpp b/lld/lib/Core/NativeWriter.cpp
index e65573e38d4..5af232640d6 100644
--- a/lld/lib/Core/NativeWriter.cpp
+++ b/lld/lib/Core/NativeWriter.cpp
@@ -7,17 +7,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <vector>
+#include "lld/Core/NativeWriter.h"
+#include "NativeFileFormat.h"
+#include "lld/Core/File.h"
 
-#include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/StringRef.h"
 
-#include "lld/Core/File.h"
-#include "lld/Core/NativeWriter.h"
-
-#include "NativeFileFormat.h"
-
+#include <vector>
 
 namespace lld {
 
diff --git a/lld/lib/Core/Resolver.cpp b/lld/lib/Core/Resolver.cpp
index 62361e002eb..617431eb68d 100644
--- a/lld/lib/Core/Resolver.cpp
+++ b/lld/lib/Core/Resolver.cpp
@@ -11,15 +11,14 @@
 #include "lld/Core/Atom.h"
 #include "lld/Core/File.h"
 #include "lld/Core/InputFiles.h"
+#include "lld/Core/Platform.h"
 #include "lld/Core/SymbolTable.h"
 #include "lld/Core/UndefinedAtom.h"
-#include "lld/Platform/Platform.h"
 
 #include "llvm/Support/raw_ostream.h"
 
 #include <algorithm>
 #include <cassert>
-
 #include <vector>
 
 namespace lld {
diff --git a/lld/lib/Core/SymbolTable.cpp b/lld/lib/Core/SymbolTable.cpp
index 4dc86b76250..bec71006faa 100644
--- a/lld/lib/Core/SymbolTable.cpp
+++ b/lld/lib/Core/SymbolTable.cpp
@@ -9,22 +9,22 @@
 
 #include "lld/Core/SymbolTable.h"
 #include "lld/Core/Atom.h"
-#include "lld/Core/DefinedAtom.h"
-#include "lld/Core/UndefinedAtom.h"
-#include "lld/Core/SharedLibraryAtom.h"
 #include "lld/Core/AbsoluteAtom.h"
+#include "lld/Core/DefinedAtom.h"
 #include "lld/Core/File.h"
 #include "lld/Core/InputFiles.h"
+#include "lld/Core/Platform.h"
 #include "lld/Core/Resolver.h"
-#include "lld/Platform/Platform.h"
+#include "lld/Core/SharedLibraryAtom.h"
+#include "lld/Core/UndefinedAtom.h"
 
-#include "llvm/Support/ErrorHandling.h"
-#include "llvm/ADT/DenseMapInfo.h"
 #include "llvm/ADT/ArrayRef.h"
+#include "llvm/ADT/DenseMapInfo.h"
+#include "llvm/Support/ErrorHandling.h"
 
 #include <algorithm>
 #include <cassert>
-#include <stdlib.h>
+#include <cstdlib>
 #include <vector>
 
 namespace lld {
diff --git a/lld/lib/Core/YamlKeyValues.cpp b/lld/lib/Core/YamlKeyValues.cpp
index 99fb95cc1ba..86d2a8cd694 100644
--- a/lld/lib/Core/YamlKeyValues.cpp
+++ b/lld/lib/Core/YamlKeyValues.cpp
@@ -7,12 +7,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <string.h>
-
 #include "YamlKeyValues.h"
 
 #include "llvm/Support/ErrorHandling.h"
 
+#include <cstring>
+
 namespace lld {
 namespace yaml {
 
diff --git a/lld/lib/Core/YamlReader.cpp b/lld/lib/Core/YamlReader.cpp
index b02f381c2cf..c4c826d6f6e 100644
--- a/lld/lib/Core/YamlReader.cpp
+++ b/lld/lib/Core/YamlReader.cpp
@@ -7,30 +7,27 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <string.h>
-
-#include "YamlKeyValues.h"
-
 #include "lld/Core/YamlReader.h"
+#include "YamlKeyValues.h"
 #include "lld/Core/Atom.h"
-#include "lld/Core/UndefinedAtom.h"
-#include "lld/Core/SharedLibraryAtom.h"
 #include "lld/Core/AbsoluteAtom.h"
 #include "lld/Core/Error.h"
 #include "lld/Core/File.h"
+#include "lld/Core/Platform.h"
 #include "lld/Core/Reference.h"
-
-#include "lld/Platform/Platform.h"
+#include "lld/Core/SharedLibraryAtom.h"
+#include "lld/Core/UndefinedAtom.h"
 
 #include "llvm/ADT/APInt.h"
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/StringRef.h"
-#include "llvm/ADT/ArrayRef.h"
 #include "llvm/Support/DataTypes.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/system_error.h"
 
+#include <cstring>
 #include <vector>
 
 
diff --git a/lld/lib/Core/YamlWriter.cpp b/lld/lib/Core/YamlWriter.cpp
index bd253b42506..7f9b0c3170e 100644
--- a/lld/lib/Core/YamlWriter.cpp
+++ b/lld/lib/Core/YamlWriter.cpp
@@ -7,21 +7,18 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "YamlKeyValues.h"
-
 #include "lld/Core/YamlWriter.h"
+#include "YamlKeyValues.h"
 #include "lld/Core/Atom.h"
 #include "lld/Core/File.h"
+#include "lld/Core/Platform.h"
 #include "lld/Core/Reference.h"
 
-#include "lld/Platform/Platform.h"
-
-#include "llvm/ADT/OwningPtr.h"
+#include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/OwningPtr.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/ADT/StringMap.h"
-#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/DataTypes.h"
 #include "llvm/Support/Format.h"
 #include "llvm/Support/MemoryBuffer.h"