Fix include guards.

llvm-svn: 194776

46 files changed, 120 insertions, 120 deletions

diff --git a/lld/include/lld/Core/AbsoluteAtom.h b/lld/include/lld/Core/AbsoluteAtom.h
index d73483b7282..f400061a86e 100644
--- a/lld/include/lld/Core/AbsoluteAtom.h
+++ b/lld/include/lld/Core/AbsoluteAtom.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_CORE_ABSOLUTE_ATOM_H_
-#define LLD_CORE_ABSOLUTE_ATOM_H_
+#ifndef LLD_CORE_ABSOLUTE_ATOM_H
+#define LLD_CORE_ABSOLUTE_ATOM_H
 
 #include "lld/Core/Atom.h"
 
@@ -40,4 +40,4 @@ protected:
 
 } // namespace lld
 
-#endif // LLD_CORE_ABSOLUTE_ATOM_H_
+#endif // LLD_CORE_ABSOLUTE_ATOM_H
diff --git a/lld/include/lld/Core/ArchiveLibraryFile.h b/lld/include/lld/Core/ArchiveLibraryFile.h
index a9698200b0d..251363d1d2b 100644
--- a/lld/include/lld/Core/ArchiveLibraryFile.h
+++ b/lld/include/lld/Core/ArchiveLibraryFile.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_CORE_ARCHIVE_LIBRARY_FILE_H_
-#define LLD_CORE_ARCHIVE_LIBRARY_FILE_H_
+#ifndef LLD_CORE_ARCHIVE_LIBRARY_FILE_H
+#define LLD_CORE_ARCHIVE_LIBRARY_FILE_H
 
 #include "lld/Core/File.h"
 
@@ -45,4 +45,4 @@ protected:
 
 } // namespace lld
 
-#endif // LLD_CORE_ARCHIVE_LIBRARY_FILE_H_
+#endif // LLD_CORE_ARCHIVE_LIBRARY_FILE_H
diff --git a/lld/include/lld/Core/Atom.h b/lld/include/lld/Core/Atom.h
index c6b6931f86c..dd23d7ca4af 100644
--- a/lld/include/lld/Core/Atom.h
+++ b/lld/include/lld/Core/Atom.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_CORE_ATOM_H_
-#define LLD_CORE_ATOM_H_
+#ifndef LLD_CORE_ATOM_H
+#define LLD_CORE_ATOM_H
 
 #include "lld/Core/LLVM.h"
 
@@ -81,4 +81,4 @@ private:
 
 } // namespace lld
 
-#endif // LLD_CORE_ATOM_H_
+#endif // LLD_CORE_ATOM_H
diff --git a/lld/include/lld/Core/LinkingContext.h b/lld/include/lld/Core/LinkingContext.h
index 35920efdc69..8584ce8c0a1 100644
--- a/lld/include/lld/Core/LinkingContext.h
+++ b/lld/include/lld/Core/LinkingContext.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_CORE_TARGET_INFO_H
-#define LLD_CORE_TARGET_INFO_H
+#ifndef LLD_CORE_LINKING_CONTEXT_H
+#define LLD_CORE_LINKING_CONTEXT_H
 
 #include "lld/Core/Error.h"
 #include "lld/Core/InputGraph.h"
diff --git a/lld/include/lld/Core/Pass.h b/lld/include/lld/Core/Pass.h
index 6d4b6a5cc26..548a2a6d464 100644
--- a/lld/include/lld/Core/Pass.h
+++ b/lld/include/lld/Core/Pass.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_CORE_PASS_H_
-#define LLD_CORE_PASS_H_
+#ifndef LLD_CORE_PASS_H
+#define LLD_CORE_PASS_H
 
 #include "lld/Core/Atom.h"
 #include "lld/Core/File.h"
@@ -115,4 +115,4 @@ public:
 
 } // namespace lld
 
-#endif // LLD_CORE_PASS_H_
+#endif // LLD_CORE_PASS_H
diff --git a/lld/include/lld/Core/Reference.h b/lld/include/lld/Core/Reference.h
index 8dc2f6d770f..1af2e987d2f 100644
--- a/lld/include/lld/Core/Reference.h
+++ b/lld/include/lld/Core/Reference.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_CORE_REFERENCES_H_
-#define LLD_CORE_REFERENCES_H_
+#ifndef LLD_CORE_REFERENCES_H
+#define LLD_CORE_REFERENCES_H
 
 #include "llvm/Support/DataTypes.h"
 #include "llvm/ADT/StringSwitch.h"
@@ -109,4 +109,4 @@ protected:
 
 } // namespace lld
 
-#endif // LLD_CORE_REFERENCES_H_
+#endif // LLD_CORE_REFERENCES_H
diff --git a/lld/include/lld/Core/Resolver.h b/lld/include/lld/Core/Resolver.h
index bb19f14e250..4b80f71d52b 100644
--- a/lld/include/lld/Core/Resolver.h
+++ b/lld/include/lld/Core/Resolver.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_CORE_RESOLVER_H_
-#define LLD_CORE_RESOLVER_H_
+#ifndef LLD_CORE_RESOLVER_H
+#define LLD_CORE_RESOLVER_H
 
 #include "lld/Core/File.h"
 #include "lld/Core/SharedLibraryFile.h"
@@ -123,4 +123,4 @@ private:
 
 } // namespace lld
 
-#endif // LLD_CORE_RESOLVER_H_
+#endif // LLD_CORE_RESOLVER_H
diff --git a/lld/include/lld/Core/SharedLibraryAtom.h b/lld/include/lld/Core/SharedLibraryAtom.h
index 8bb2d362a5e..76a7d0a2f0c 100644
--- a/lld/include/lld/Core/SharedLibraryAtom.h
+++ b/lld/include/lld/Core/SharedLibraryAtom.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_CORE_SHARED_LIBRARY_ATOM_H_
-#define LLD_CORE_SHARED_LIBRARY_ATOM_H_
+#ifndef LLD_CORE_SHARED_LIBRARY_ATOM_H
+#define LLD_CORE_SHARED_LIBRARY_ATOM_H
 
 #include "lld/Core/Atom.h"
 
@@ -54,4 +54,4 @@ protected:
 
 } // namespace lld
 
-#endif // LLD_CORE_SHARED_LIBRARY_ATOM_H_
+#endif // LLD_CORE_SHARED_LIBRARY_ATOM_H
diff --git a/lld/include/lld/Core/SharedLibraryFile.h b/lld/include/lld/Core/SharedLibraryFile.h
index edd2c8fda8e..bdbe1f4d214 100644
--- a/lld/include/lld/Core/SharedLibraryFile.h
+++ b/lld/include/lld/Core/SharedLibraryFile.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_CORE_SHARED_LIBRARY_FILE_H_
-#define LLD_CORE_SHARED_LIBRARY_FILE_H_
+#ifndef LLD_CORE_SHARED_LIBRARY_FILE_H
+#define LLD_CORE_SHARED_LIBRARY_FILE_H
 
 #include "lld/Core/File.h"
 #include "lld/Core/SharedLibraryAtom.h"
@@ -39,4 +39,4 @@ protected:
 
 } // namespace lld
 
-#endif // LLD_CORE_SHARED_LIBRARY_FILE_H_
+#endif // LLD_CORE_SHARED_LIBRARY_FILE_H
diff --git a/lld/include/lld/Core/SymbolTable.h b/lld/include/lld/Core/SymbolTable.h
index 0cf1e2e1048..a9d7a1e8a3b 100644
--- a/lld/include/lld/Core/SymbolTable.h
+++ b/lld/include/lld/Core/SymbolTable.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_CORE_SYMBOL_TABLE_H_
-#define LLD_CORE_SYMBOL_TABLE_H_
+#ifndef LLD_CORE_SYMBOL_TABLE_H
+#define LLD_CORE_SYMBOL_TABLE_H
 
 #include "lld/Core/LLVM.h"
 
@@ -107,4 +107,4 @@ private:
 
 } // namespace lld
 
-#endif // LLD_CORE_SYMBOL_TABLE_H_
+#endif // LLD_CORE_SYMBOL_TABLE_H
diff --git a/lld/include/lld/Core/UndefinedAtom.h b/lld/include/lld/Core/UndefinedAtom.h
index 8bfbedce1c6..5bb14e8c007 100644
--- a/lld/include/lld/Core/UndefinedAtom.h
+++ b/lld/include/lld/Core/UndefinedAtom.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_CORE_UNDEFINED_ATOM_H_
-#define LLD_CORE_UNDEFINED_ATOM_H_
+#ifndef LLD_CORE_UNDEFINED_ATOM_H
+#define LLD_CORE_UNDEFINED_ATOM_H
 
 #include "lld/Core/Atom.h"
 
@@ -71,4 +71,4 @@ protected:
 
 } // namespace lld
 
-#endif // LLD_CORE_UNDEFINED_ATOM_H_
+#endif // LLD_CORE_UNDEFINED_ATOM_H
diff --git a/lld/include/lld/Core/range.h b/lld/include/lld/Core/range.h
index 11bcf3b6f0d..e4b6e257456 100644
--- a/lld/include/lld/Core/range.h
+++ b/lld/include/lld/Core/range.h
@@ -14,8 +14,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_ADT_RANGE_H
-#define LLD_ADT_RANGE_H
+#ifndef LLD_CORE_RANGE_H
+#define LLD_CORE_RANGE_H
 
 #include "llvm/Support/Compiler.h"
 
diff --git a/lld/include/lld/ReaderWriter/AtomLayout.h b/lld/include/lld/ReaderWriter/AtomLayout.h
index 20b55f767df..e182464908b 100644
--- a/lld/include/lld/ReaderWriter/AtomLayout.h
+++ b/lld/include/lld/ReaderWriter/AtomLayout.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_LAYOUT_H
-#define LLD_READER_WRITER_LAYOUT_H
+#ifndef LLD_READER_WRITER_ATOM_LAYOUT_H
+#define LLD_READER_WRITER_ATOM_LAYOUT_H
 
 #include <cstdint>
 
diff --git a/lld/include/lld/ReaderWriter/FileArchive.h b/lld/include/lld/ReaderWriter/FileArchive.h
index 82422bc49a1..9ef5021fc9e 100644
--- a/lld/include/lld/ReaderWriter/FileArchive.h
+++ b/lld/include/lld/ReaderWriter/FileArchive.h
@@ -6,8 +6,8 @@
 // License. See LICENSE.TXT for details.
 //
 //===---------------------------------------------------------------------===//
-#ifndef LLD_FILEARCHIVE_H
-#define LLD_FILEARCHIVE_H
+#ifndef LLD_READER_WRITER_FILE_ARCHIVE_H
+#define LLD_READER_WRITER_FILE_ARCHIVE_H
 
 #include "lld/Core/ArchiveLibraryFile.h"
 
@@ -173,4 +173,4 @@ public:
 
 } // end namespace lld
 
-#endif // LLD_FILEARCHIVE_H
+#endif // LLD_READER_WRITER_FILE_ARCHIVE_H
diff --git a/lld/include/lld/ReaderWriter/MachOFormat.hpp b/lld/include/lld/ReaderWriter/MachOFormat.hpp
index 3d27a3193a9..615be544bb1 100644
--- a/lld/include/lld/ReaderWriter/MachOFormat.hpp
+++ b/lld/include/lld/ReaderWriter/MachOFormat.hpp
@@ -18,8 +18,8 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/Memory.h"
 
-#ifndef LLD_READER_WRITER_MACHO_FORMAT_H_
-#define LLD_READER_WRITER_MACHO_FORMAT_H_
+#ifndef LLD_READER_WRITER_MACHO_FORMAT_H
+#define LLD_READER_WRITER_MACHO_FORMAT_H
 
 namespace lld {
 namespace mach_o {
@@ -623,5 +623,5 @@ public:
 
 
 
-#endif // LLD_READER_WRITER_MACHO_FORMAT_H_
+#endif // LLD_READER_WRITER_MACHO_FORMAT_H
 
diff --git a/lld/include/lld/ReaderWriter/MachOLinkingContext.h b/lld/include/lld/ReaderWriter/MachOLinkingContext.h
index a416ede6211..a26ddc12024 100644
--- a/lld/include/lld/ReaderWriter/MachOLinkingContext.h
+++ b/lld/include/lld/ReaderWriter/MachOLinkingContext.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_MACHO_LINKER_CONTEXT_H
-#define LLD_READER_WRITER_MACHO_LINKER_CONTEXT_H
+#ifndef LLD_READER_WRITER_MACHO_LINKING_CONTEXT_H
+#define LLD_READER_WRITER_MACHO_LINKING_CONTEXT_H
 
 #include "lld/Core/LinkingContext.h"
 #include "lld/ReaderWriter/Reader.h"
diff --git a/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h b/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h
index 481354c505f..331d9760c43 100644
--- a/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h
+++ b/lld/include/lld/ReaderWriter/PECOFFLinkingContext.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_PECOFF_LINKER_CONTEXT_H
-#define LLD_READER_WRITER_PECOFF_LINKER_CONTEXT_H
+#ifndef LLD_READER_WRITER_PECOFF_LINKING_CONTEXT_H
+#define LLD_READER_WRITER_PECOFF_LINKING_CONTEXT_H
 
 #include <map>
 #include <set>
diff --git a/lld/include/lld/ReaderWriter/Reader.h b/lld/include/lld/ReaderWriter/Reader.h
index eb726564d36..436e45e15a1 100644
--- a/lld/include/lld/ReaderWriter/Reader.h
+++ b/lld/include/lld/ReaderWriter/Reader.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READERWRITER_READER_H
-#define LLD_READERWRITER_READER_H
+#ifndef LLD_READER_WRITER_READER_H
+#define LLD_READER_WRITER_READER_H
 
 #include "lld/Core/LLVM.h"
 
diff --git a/lld/include/lld/ReaderWriter/Writer.h b/lld/include/lld/ReaderWriter/Writer.h
index 4a5bec25d1a..2f33bb38a39 100644
--- a/lld/include/lld/ReaderWriter/Writer.h
+++ b/lld/include/lld/ReaderWriter/Writer.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READERWRITER_WRITER_H
-#define LLD_READERWRITER_WRITER_H
+#ifndef LLD_READER_WRITER_WRITER_H
+#define LLD_READER_WRITER_WRITER_H
 
 #include "lld/Core/LLVM.h"
 
diff --git a/lld/lib/ReaderWriter/ELF/DefaultTargetHandler.h b/lld/lib/ReaderWriter/ELF/DefaultTargetHandler.h
index 7f0962a5440..bc484a0ee4d 100644
--- a/lld/lib/ReaderWriter/ELF/DefaultTargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/DefaultTargetHandler.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_ELF_DEFAULT_TARGETHANDLER_H
-#define LLD_READER_WRITER_ELF_DEFAULT_TARGETHANDLER_H
+#ifndef LLD_READER_WRITER_ELF_DEFAULT_TARGET_HANDLER_H
+#define LLD_READER_WRITER_ELF_DEFAULT_TARGET_HANDLER_H
 
 #include "DefaultLayout.h"
 #include "TargetHandler.h"
diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h
index 5191cc108c5..f4b01acc8bb 100644
--- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h
+++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonExecutableAtoms.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_ELF_HEXAGON_EXECUTABLE_ATOM_H
-#define LLD_READER_WRITER_ELF_HEXAGON_EXECUTABLE_ATOM_H
+#ifndef LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_EXECUTABLE_ATOM_H
+#define LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_EXECUTABLE_ATOM_H
 
 #include "File.h"
 
@@ -26,4 +26,4 @@ public:
 } // elf
 } // lld
 
-#endif // LLD_READER_WRITER_ELF_HEXAGON_EXECUTABLE_ATOM_H
+#endif // LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_EXECUTABLE_ATOM_H
diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h
index 90379503056..3e8da2b57fd 100644
--- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h
+++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonLinkingContext.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_ELF_HEXAGON_TARGETINFO_H
-#define LLD_READER_WRITER_ELF_HEXAGON_TARGETINFO_H
+#ifndef LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_LINKING_CONTEXT_H
+#define LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_LINKING_CONTEXT_H
 
 #include "HexagonTargetHandler.h"
 
@@ -69,4 +69,4 @@ public:
 } // elf
 } // lld
 
-#endif // LLD_READER_WRITER_ELF_HEXAGON_TARGETINFO_H
+#endif // LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_LINKING_CONTEXT_H
diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationFunctions.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationFunctions.h
index 890d17b261f..56e88ba2c34 100644
--- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationFunctions.h
+++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationFunctions.h
@@ -6,8 +6,8 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_HEXAGON_RELOCATION_FUNCTIONS_H
-#define LLD_READER_WRITER_ELF_HEXAGON_RELOCATION_FUNCTIONS_H
+#ifndef LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_RELOCATION_FUNCTIONS_H
+#define LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_RELOCATION_FUNCTIONS_H
 
 namespace lld {
 namespace elf {
@@ -46,4 +46,4 @@ findBitMask(uint32_t insn, Instruction *encodings, int32_t numInsns) {
 } // elf
 } // lld
 
-#endif // LLD_READER_WRITER_ELF_HEXAGON_RELOCATION_FUNCTIONS_H
+#endif // LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_RELOCATION_FUNCTIONS_H
diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h
index 88653912088..a12fb384770 100644
--- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h
+++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.h
@@ -6,8 +6,8 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_HEXAGON_RELOCATION_HANDLER_H
-#define LLD_READER_WRITER_ELF_HEXAGON_RELOCATION_HANDLER_H
+#ifndef LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_RELOCATION_HANDLER_H
+#define LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_RELOCATION_HANDLER_H
 
 #include "HexagonSectionChunks.h"
 #include "HexagonTargetHandler.h"
diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h
index 474f8230f67..aba02061365 100644
--- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h
+++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonSectionChunks.h
@@ -6,8 +6,8 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_ELF_HEXAGON_SECTION_CHUNKS_H
-#define LLD_READER_WRITER_ELF_HEXAGON_SECTION_CHUNKS_H
+#ifndef LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_SECTION_CHUNKS_H
+#define LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_SECTION_CHUNKS_H
 
 #include "HexagonTargetHandler.h"
 
@@ -84,4 +84,4 @@ void SDataSection<HexagonELFType>::doPreFlight() {
 } // elf
 } // lld
 
-#endif // LLD_READER_WRITER_ELF_HEXAGON_SECTION_CHUNKS_H
+#endif // LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_SECTION_CHUNKS_H
diff --git a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
index 56b14b332a5..4bfd161a2d6 100644
--- a/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_ELF_HEXAGON_TARGET_HANDLER_H
-#define LLD_READER_WRITER_ELF_HEXAGON_TARGET_HANDLER_H
+#ifndef LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_TARGET_HANDLER_H
+#define LLD_READER_WRITER_ELF_HEXAGON_HEXAGON_TARGET_HANDLER_H
 
 #include "DefaultTargetHandler.h"
 #include "HexagonExecutableAtoms.h"
diff --git a/lld/lib/ReaderWriter/ELF/OutputELFWriter.h b/lld/lib/ReaderWriter/ELF/OutputELFWriter.h
index 9789250928c..e74b1d87368 100644
--- a/lld/lib/ReaderWriter/ELF/OutputELFWriter.h
+++ b/lld/lib/ReaderWriter/ELF/OutputELFWriter.h
@@ -6,8 +6,8 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLD_READER_WRITER_OUTPUT_ELF_WRITER_H
-#define LLD_READER_WRITER_OUTPUT_ELF_WRITER_H
+#ifndef LLD_READER_WRITER_ELF_OUTPUT_WRITER_H
+#define LLD_READER_WRITER_ELF_OUTPUT_WRITER_H
 
 #include "lld/Core/Instrumentation.h"
 #include "lld/Core/Parallel.h"
@@ -427,4 +427,4 @@ error_code OutputELFWriter<ELFT>::writeFile(const File &file, StringRef path) {
 } // namespace elf
 } // namespace lld
 
-#endif // LLD_READER_WRITER_OUTPUT_ELF_WRITER_H
+#endif // LLD_READER_WRITER_ELF_OUTPUT_WRITER_H
diff --git a/lld/lib/ReaderWriter/ELF/PPC/PPCLinkingContext.h b/lld/lib/ReaderWriter/ELF/PPC/PPCLinkingContext.h
index 9ebb4eb4a1c..9f60aef17a9 100644
--- a/lld/lib/ReaderWriter/ELF/PPC/PPCLinkingContext.h
+++ b/lld/lib/ReaderWriter/ELF/PPC/PPCLinkingContext.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_ELF_PPC_TARGETINFO_H
-#define LLD_READER_WRITER_ELF_PPC_TARGETINFO_H
+#ifndef LLD_READER_WRITER_ELF_PPC_PPC_LINKING_CONTEXT_H
+#define LLD_READER_WRITER_ELF_PPC_PPC_LINKING_CONTEXT_H
 
 #include "PPCTargetHandler.h"
 
@@ -37,4 +37,4 @@ public:
 } // elf
 } // lld
 
-#endif // LLD_READER_WRITER_ELF_PPC_TARGETINFO_H
+#endif // LLD_READER_WRITER_ELF_PPC_PPC_LINKING_CONTEXT_H
diff --git a/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h b/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h
index c38193fa3c1..f4e86d80997 100644
--- a/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/PPC/PPCTargetHandler.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_ELF_PPC_TARGET_HANDLER_H
-#define LLD_READER_WRITER_ELF_PPC_TARGET_HANDLER_H
+#ifndef LLD_READER_WRITER_ELF_PPC_PPC_TARGET_HANDLER_H
+#define LLD_READER_WRITER_ELF_PPC_PPC_TARGET_HANDLER_H
 
 #include "DefaultTargetHandler.h"
 #include "TargetLayout.h"
diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.h b/lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.h
index 7877869bf36..1551100e37f 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.h
+++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64LinkingContext.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_ELF_X86_64_LINKER_CONTEXT_H
-#define LLD_READER_WRITER_ELF_X86_64_LINKER_CONTEXT_H
+#ifndef LLD_READER_WRITER_ELF_X86_64_X86_64_LINKING_CONTEXT_H
+#define LLD_READER_WRITER_ELF_X86_64_X86_64_LINKING_CONTEXT_H
 
 #include "X86_64TargetHandler.h"
 
diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h b/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h
index 64665fce4e0..d2b5088acbd 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h
+++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationHandler.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef X86_64_RELOCATION_HANDLER_H
-#define X86_64_RELOCATION_HANDLER_H
+#ifndef LLD_READER_WRITER_ELF_X86_64_X86_64_RELOCATION_HANDLER_H
+#define LLD_READER_WRITER_ELF_X86_64_X86_64_RELOCATION_HANDLER_H
 
 #include "X86_64TargetHandler.h"
 
diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.h b/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.h
index 81c80d84dbc..1635b5e5f57 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.h
+++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64RelocationPass.h
@@ -13,8 +13,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_ELF_X86_64_RELOCATION_PASS_H
-#define LLD_READER_WRITER_ELF_X86_64_RELOCATION_PASS_H
+#ifndef LLD_READER_WRITER_ELF_X86_64_X86_64_RELOCATION_PASS_H
+#define LLD_READER_WRITER_ELF_X86_64_X86_64_RELOCATION_PASS_H
 
 #include <memory>
 
diff --git a/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h b/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
index 5d3ee220a91..6d343c5f696 100644
--- a/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
+++ b/lld/lib/ReaderWriter/ELF/X86_64/X86_64TargetHandler.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_ELF_X86_64_TARGET_HANDLER_H
-#define LLD_READER_WRITER_ELF_X86_64_TARGET_HANDLER_H
+#ifndef LLD_READER_WRITER_ELF_X86_64_X86_64_TARGET_HANDLER_H
+#define LLD_READER_WRITER_ELF_X86_64_X86_64_TARGET_HANDLER_H
 
 #include "DefaultTargetHandler.h"
 #include "File.h"
diff --git a/lld/lib/ReaderWriter/MachO/ExecutableAtoms.hpp b/lld/lib/ReaderWriter/MachO/ExecutableAtoms.hpp
index b144d8abace..f0caa8b000e 100644
--- a/lld/lib/ReaderWriter/MachO/ExecutableAtoms.hpp
+++ b/lld/lib/ReaderWriter/MachO/ExecutableAtoms.hpp
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_MACHO_EXECUTABLE_ATOM_H_
-#define LLD_READER_WRITER_MACHO_EXECUTABLE_ATOM_H_
+#ifndef LLD_READER_WRITER_MACHO_EXECUTABLE_ATOMS_H
+#define LLD_READER_WRITER_MACHO_EXECUTABLE_ATOMS_H
 
 #include "llvm/Support/MachO.h"
 
@@ -45,4 +45,4 @@ private:
 } // namespace mach_o
 } // namespace lld
 
-#endif // LLD_READER_WRITER_MACHO_EXECUTABLE_ATOM_H_
+#endif // LLD_READER_WRITER_MACHO_EXECUTABLE_ATOMS_H
diff --git a/lld/lib/ReaderWriter/MachO/GOTPass.hpp b/lld/lib/ReaderWriter/MachO/GOTPass.hpp
index 9618302ede4..9eb3af5e2a7 100644
--- a/lld/lib/ReaderWriter/MachO/GOTPass.hpp
+++ b/lld/lib/ReaderWriter/MachO/GOTPass.hpp
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_MACHO_GOT_PASS_H_
-#define LLD_READER_WRITER_MACHO_GOT_PASS_H_
+#ifndef LLD_READER_WRITER_MACHO_GOT_PASS_H
+#define LLD_READER_WRITER_MACHO_GOT_PASS_H
 
 #include "lld/Core/DefinedAtom.h"
 #include "lld/Core/SharedLibraryAtom.h"
@@ -48,4 +48,4 @@ public:
 } // namespace lld 
 
 
-#endif // LLD_READER_WRITER_MACHO_GOT_PASS_H_
+#endif // LLD_READER_WRITER_MACHO_GOT_PASS_H
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h b/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
index b90370d2629..d5131147524 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
@@ -49,8 +49,8 @@
 #include "llvm/Support/MachO.h"
 #include "llvm/Support/YAMLTraits.h"
 
-#ifndef LLD_READER_WRITER_MACHO_NORMALIZED_H_
-#define LLD_READER_WRITER_MACHO_NORMALIZED_H_
+#ifndef LLD_READER_WRITER_MACHO_NORMALIZE_FILE_H
+#define LLD_READER_WRITER_MACHO_NORMALIZE_FILE_H
 
 using llvm::yaml::Hex64;
 using llvm::yaml::Hex32;
@@ -272,7 +272,7 @@ normalizedFromAtoms(const lld::File &atomFile, const MachOLinkingContext &ctxt);
 } // namespace mach_o
 } // namespace lld
 
-#endif // LLD_READER_WRITER_MACHO_NORMALIZED_H_
+#endif // LLD_READER_WRITER_MACHO_NORMALIZE_FILE_H
 
 
 
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
index 8f2ed52c738..7f598592a95 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFileBinaryUtils.h
@@ -20,8 +20,8 @@
 #include "llvm/Support/MachO.h"
 #include "llvm/Support/system_error.h"
 
-#ifndef LLD_READER_WRITER_MACHO_NORMALIZED_UILS_H_
-#define LLD_READER_WRITER_MACHO_NORMALIZED_UILS_H_
+#ifndef LLD_READER_WRITER_MACHO_NORMALIZED_FILE_BINARY_UTILS_H
+#define LLD_READER_WRITER_MACHO_NORMALIZED_FILE_BINARY_UTILS_H
 
 namespace lld {
 namespace mach_o {
@@ -290,4 +290,4 @@ inline void setString16(StringRef str, char s[16]) {
 } // namespace mach_o
 } // namespace lld
 
-#endif // LLD_READER_WRITER_MACHO_NORMALIZED_UILS_H_
+#endif // LLD_READER_WRITER_MACHO_NORMALIZED_FILE_BINARY_UTILS_H
diff --git a/lld/lib/ReaderWriter/MachO/ReferenceKinds.h b/lld/lib/ReaderWriter/MachO/ReferenceKinds.h
index 99a49b513b0..df4945e13f7 100644
--- a/lld/lib/ReaderWriter/MachO/ReferenceKinds.h
+++ b/lld/lib/ReaderWriter/MachO/ReferenceKinds.h
@@ -14,8 +14,8 @@
 
 #include "llvm/ADT/Triple.h"
 
-#ifndef LLD_READER_WRITER_MACHO_REFERENCE_KINDS_H_
-#define LLD_READER_WRITER_MACHO_REFERENCE_KINDS_H_
+#ifndef LLD_READER_WRITER_MACHO_REFERENCE_KINDS_H
+#define LLD_READER_WRITER_MACHO_REFERENCE_KINDS_H
 
 namespace lld {
 namespace mach_o {
@@ -147,5 +147,5 @@ public:
 
 
 
-#endif // LLD_READER_WRITER_MACHO_REFERENCE_KINDS_H_
+#endif // LLD_READER_WRITER_MACHO_REFERENCE_KINDS_H
 
diff --git a/lld/lib/ReaderWriter/MachO/StubAtoms.hpp b/lld/lib/ReaderWriter/MachO/StubAtoms.hpp
index cc2fa17a877..ae0707f7835 100644
--- a/lld/lib/ReaderWriter/MachO/StubAtoms.hpp
+++ b/lld/lib/ReaderWriter/MachO/StubAtoms.hpp
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_MACHO_STUB_ATOM_H_
-#define LLD_READER_WRITER_MACHO_STUB_ATOM_H_
+#ifndef LLD_READER_WRITER_MACHO_STUB_ATOMS_H
+#define LLD_READER_WRITER_MACHO_STUB_ATOMS_H
 
 #include "llvm/ADT/ArrayRef.h"
 
@@ -68,4 +68,4 @@ private:
 } // namespace lld 
 
 
-#endif // LLD_READER_WRITER_MACHO_STUB_ATOM_H_
+#endif // LLD_READER_WRITER_MACHO_STUB_ATOMS_H
diff --git a/lld/lib/ReaderWriter/MachO/StubAtoms_x86.hpp b/lld/lib/ReaderWriter/MachO/StubAtoms_x86.hpp
index 47bacf09c64..28c32622aaf 100644
--- a/lld/lib/ReaderWriter/MachO/StubAtoms_x86.hpp
+++ b/lld/lib/ReaderWriter/MachO/StubAtoms_x86.hpp
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_MACHO_STUB_ATOM_X86_H_
-#define LLD_READER_WRITER_MACHO_STUB_ATOM_X86_H_
+#ifndef LLD_READER_WRITER_MACHO_STUB_ATOMS_X86_H
+#define LLD_READER_WRITER_MACHO_STUB_ATOMS_X86_H
 
 #include "llvm/ADT/ArrayRef.h"
 
@@ -196,4 +196,4 @@ public:
 } // namespace lld
 
 
-#endif // LLD_READER_WRITER_MACHO_STUB_ATOM_X86_H_
+#endif // LLD_READER_WRITER_MACHO_STUB_ATOMS_X86_H
diff --git a/lld/lib/ReaderWriter/MachO/StubAtoms_x86_64.hpp b/lld/lib/ReaderWriter/MachO/StubAtoms_x86_64.hpp
index 25d74d8e7bb..a4b1529f5f3 100644
--- a/lld/lib/ReaderWriter/MachO/StubAtoms_x86_64.hpp
+++ b/lld/lib/ReaderWriter/MachO/StubAtoms_x86_64.hpp
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_MACHO_STUB_ATOM_X86_64_H_
-#define LLD_READER_WRITER_MACHO_STUB_ATOM_X86_64_H_
+#ifndef LLD_READER_WRITER_MACHO_STUB_ATOMS_X86_64_H
+#define LLD_READER_WRITER_MACHO_STUB_ATOMS_X86_64_H
 
 #include "llvm/ADT/ArrayRef.h"
 
@@ -196,4 +196,4 @@ public:
 } // namespace lld
 
 
-#endif // LLD_READER_WRITER_MACHO_STUB_ATOM_X86_64_H_
+#endif // LLD_READER_WRITER_MACHO_STUB_ATOMS_X86_64_H
diff --git a/lld/lib/ReaderWriter/MachO/StubsPass.hpp b/lld/lib/ReaderWriter/MachO/StubsPass.hpp
index 83afd7b1f1a..885ee1130a3 100644
--- a/lld/lib/ReaderWriter/MachO/StubsPass.hpp
+++ b/lld/lib/ReaderWriter/MachO/StubsPass.hpp
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_MACHO_STUBS_PASS_H_
-#define LLD_READER_WRITER_MACHO_STUBS_PASS_H_
+#ifndef LLD_READER_WRITER_MACHO_STUBS_PASS_H
+#define LLD_READER_WRITER_MACHO_STUBS_PASS_H
 
 #include "llvm/ADT/DenseMap.h"
 
@@ -170,4 +170,4 @@ private:
 } // namespace lld
 
 
-#endif // LLD_READER_WRITER_MACHO_STUBS_PASS_H_
+#endif // LLD_READER_WRITER_MACHO_STUBS_PASS_H
diff --git a/lld/lib/ReaderWriter/Native/NativeFileFormat.h b/lld/lib/ReaderWriter/Native/NativeFileFormat.h
index 834cbfc1d0a..880cc2afd0d 100644
--- a/lld/lib/ReaderWriter/Native/NativeFileFormat.h
+++ b/lld/lib/ReaderWriter/Native/NativeFileFormat.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_NATIVE_FILE_FORMAT_H_
-#define LLD_READER_WRITER_NATIVE_FILE_FORMAT_H_
+#ifndef LLD_READER_WRITER_NATIVE_NATIVE_FILE_FORMAT_H
+#define LLD_READER_WRITER_NATIVE_NATIVE_FILE_FORMAT_H
 
 #include "llvm/Support/DataTypes.h"
 
@@ -245,4 +245,4 @@ struct NativeReferenceIvarsV2 {
 
 } // namespace lld
 
-#endif // LLD_READER_WRITER_NATIVE_FILE_FORMAT_H_
+#endif // LLD_READER_WRITER_NATIVE_NATIVE_FILE_FORMAT_H
diff --git a/lld/lib/ReaderWriter/PECOFF/Atoms.h b/lld/lib/ReaderWriter/PECOFF/Atoms.h
index 6c16f9f4373..b16cd5cd194 100644
--- a/lld/lib/ReaderWriter/PECOFF/Atoms.h
+++ b/lld/lib/ReaderWriter/PECOFF/Atoms.h
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_PE_COFF_ATOMS_H_
-#define LLD_READER_WRITER_PE_COFF_ATOMS_H_
+#ifndef LLD_READER_WRITER_PE_COFF_ATOMS_H
+#define LLD_READER_WRITER_PE_COFF_ATOMS_H
 
 #include "lld/Core/File.h"
 #include "llvm/ADT/ArrayRef.h"
diff --git a/lld/lib/ReaderWriter/PECOFF/GroupedSectionsPass.h b/lld/lib/ReaderWriter/PECOFF/GroupedSectionsPass.h
index faf0b001cfa..2435448a443 100644
--- a/lld/lib/ReaderWriter/PECOFF/GroupedSectionsPass.h
+++ b/lld/lib/ReaderWriter/PECOFF/GroupedSectionsPass.h
@@ -34,8 +34,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_PE_COFF_GROUPED_SECTIONS_PASS_H_
-#define LLD_READER_WRITER_PE_COFF_GROUPED_SECTIONS_PASS_H_
+#ifndef LLD_READER_WRITER_PE_COFF_GROUPED_SECTIONS_PASS_H
+#define LLD_READER_WRITER_PE_COFF_GROUPED_SECTIONS_PASS_H
 
 #include "Atoms.h"
 #include "lld/Core/Pass.h"
diff --git a/lld/lib/ReaderWriter/PECOFF/IdataPass.h b/lld/lib/ReaderWriter/PECOFF/IdataPass.h
index 8a908daccbd..b4b2f1f8379 100644
--- a/lld/lib/ReaderWriter/PECOFF/IdataPass.h
+++ b/lld/lib/ReaderWriter/PECOFF/IdataPass.h
@@ -16,8 +16,8 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#ifndef LLD_READER_WRITER_PE_COFF_IDATA_PASS_H_
-#define LLD_READER_WRITER_PE_COFF_IDATA_PASS_H_
+#ifndef LLD_READER_WRITER_PE_COFF_IDATA_PASS_H
+#define LLD_READER_WRITER_PE_COFF_IDATA_PASS_H
 
 #include "Atoms.h"