From 63bebdd8131b67838c2f7140bc7bc273d3fababf Mon Sep 17 00:00:00 2001
From: Maksim Panchenko <maks@fb.com>
Date: Thu, 18 Nov 2021 12:21:38 -0800
Subject: [PATCH] [BOLT][NFC] Change guard macros in headers

Summary: Change macro names to match the new directory structure.

(cherry picked from FBD32540857)
---
 bolt/include/bolt/Core/BinaryBasicBlock.h             |  4 ++--
 bolt/include/bolt/Core/BinaryContext.h                |  4 ++--
 bolt/include/bolt/Core/BinaryData.h                   |  4 ++--
 bolt/include/bolt/Core/BinaryEmitter.h                |  4 ++--
 bolt/include/bolt/Core/BinaryFunction.h               |  4 ++--
 bolt/include/bolt/Core/BinaryLoop.h                   |  4 ++--
 bolt/include/bolt/Core/BinarySection.h                |  4 ++--
 bolt/include/bolt/Core/DebugData.h                    |  4 ++--
 bolt/include/bolt/Core/DynoStats.h                    |  4 ++--
 bolt/include/bolt/Core/Exceptions.h                   |  4 ++--
 bolt/include/bolt/Core/JumpTable.h                    |  4 ++--
 bolt/include/bolt/Core/MCPlus.h                       |  4 ++--
 bolt/include/bolt/Core/MCPlusBuilder.h                |  4 ++--
 bolt/include/bolt/Core/ParallelUtilities.h            |  4 ++--
 bolt/include/bolt/Core/Relocation.h                   |  4 ++--
 bolt/include/bolt/Passes/ADRRelaxationPass.h          |  4 ++--
 bolt/include/bolt/Passes/Aligner.h                    |  4 ++--
 bolt/include/bolt/Passes/AllocCombiner.h              |  4 ++--
 bolt/include/bolt/Passes/AsmDump.h                    |  4 ++--
 bolt/include/bolt/Passes/BinaryFunctionCallGraph.h    |  4 ++--
 bolt/include/bolt/Passes/BinaryPasses.h               |  4 ++--
 bolt/include/bolt/Passes/CacheMetrics.h               |  6 +++---
 bolt/include/bolt/Passes/CallGraph.h                  |  4 ++--
 bolt/include/bolt/Passes/CallGraphWalker.h            |  4 ++--
 bolt/include/bolt/Passes/DataflowAnalysis.h           |  4 ++--
 bolt/include/bolt/Passes/DataflowInfoManager.h        |  4 ++--
 bolt/include/bolt/Passes/DominatorAnalysis.h          |  4 ++--
 bolt/include/bolt/Passes/FrameAnalysis.h              |  4 ++--
 bolt/include/bolt/Passes/FrameOptimizer.h             |  4 ++--
 bolt/include/bolt/Passes/HFSort.h                     | 10 +++++-----
 bolt/include/bolt/Passes/IdenticalCodeFolding.h       |  4 ++--
 bolt/include/bolt/Passes/IndirectCallPromotion.h      |  4 ++--
 bolt/include/bolt/Passes/Inliner.h                    |  4 ++--
 bolt/include/bolt/Passes/Instrumentation.h            |  4 ++--
 bolt/include/bolt/Passes/InstrumentationSummary.h     |  4 ++--
 bolt/include/bolt/Passes/JTFootprintReduction.h       |  4 ++--
 bolt/include/bolt/Passes/LivenessAnalysis.h           |  4 ++--
 bolt/include/bolt/Passes/LongJmp.h                    |  4 ++--
 bolt/include/bolt/Passes/LoopInversionPass.h          |  4 ++--
 bolt/include/bolt/Passes/MCF.h                        | 11 +++++------
 bolt/include/bolt/Passes/PLTCall.h                    |  4 ++--
 bolt/include/bolt/Passes/PatchEntries.h               |  4 ++--
 bolt/include/bolt/Passes/ReachingDefOrUse.h           |  4 ++--
 bolt/include/bolt/Passes/ReachingInsns.h              |  4 ++--
 bolt/include/bolt/Passes/RegAnalysis.h                |  4 ++--
 bolt/include/bolt/Passes/RegReAssign.h                |  4 ++--
 bolt/include/bolt/Passes/ReorderAlgorithm.h           |  4 ++--
 bolt/include/bolt/Passes/ReorderData.h                |  4 ++--
 bolt/include/bolt/Passes/ReorderFunctions.h           |  6 +++---
 bolt/include/bolt/Passes/ReorderUtils.h               |  4 ++--
 bolt/include/bolt/Passes/RetpolineInsertion.h         |  7 ++++---
 bolt/include/bolt/Passes/ShrinkWrapping.h             |  4 ++--
 bolt/include/bolt/Passes/SplitFunctions.h             |  4 ++--
 bolt/include/bolt/Passes/StackAllocationAnalysis.h    |  4 ++--
 bolt/include/bolt/Passes/StackAvailableExpressions.h  |  4 ++--
 bolt/include/bolt/Passes/StackPointerTracking.h       |  4 ++--
 bolt/include/bolt/Passes/StackReachingUses.h          |  4 ++--
 bolt/include/bolt/Passes/StokeInfo.h                  |  4 ++--
 bolt/include/bolt/Passes/TailDuplication.h            |  4 ++--
 bolt/include/bolt/Passes/ThreeWayBranch.h             |  4 ++--
 bolt/include/bolt/Passes/ValidateInternalCalls.h      |  4 ++--
 bolt/include/bolt/Passes/VeneerElimination.h          |  7 ++++---
 bolt/include/bolt/Profile/BoltAddressTranslation.h    |  4 ++--
 bolt/include/bolt/Profile/DataAggregator.h            |  4 ++--
 bolt/include/bolt/Profile/DataReader.h                |  4 ++--
 bolt/include/bolt/Profile/Heatmap.h                   |  4 ++--
 bolt/include/bolt/Profile/ProfileReaderBase.h         |  4 ++--
 bolt/include/bolt/Profile/ProfileYAMLMapping.h        |  4 ++--
 bolt/include/bolt/Profile/YAMLProfileReader.h         |  4 ++--
 bolt/include/bolt/Profile/YAMLProfileWriter.h         |  5 ++---
 bolt/include/bolt/Rewrite/BinaryPassManager.h         |  6 +++---
 bolt/include/bolt/Rewrite/DWARFRewriter.h             |  4 ++--
 .../bolt/Rewrite/ExecutableFileMemoryManager.h        |  4 ++--
 bolt/include/bolt/Rewrite/MachORewriteInstance.h      |  4 ++--
 bolt/include/bolt/Rewrite/RewriteInstance.h           |  4 ++--
 bolt/include/bolt/RuntimeLibs/HugifyRuntimeLibrary.h  |  4 ++--
 .../bolt/RuntimeLibs/InstrumentationRuntimeLibrary.h  |  4 ++--
 bolt/include/bolt/RuntimeLibs/RuntimeLibrary.h        |  6 +++---
 bolt/include/bolt/Utils/CommandLineOpts.h             |  4 ++--
 bolt/include/bolt/Utils/NameResolver.h                |  4 ++--
 bolt/include/bolt/Utils/NameShortener.h               |  4 ++--
 bolt/include/bolt/Utils/Utils.h                       |  4 ++--
 82 files changed, 178 insertions(+), 178 deletions(-)

diff --git a/bolt/include/bolt/Core/BinaryBasicBlock.h b/bolt/include/bolt/Core/BinaryBasicBlock.h
index af4672cc4bff..7419bc5fb8bc 100644
--- a/bolt/include/bolt/Core/BinaryBasicBlock.h
+++ b/bolt/include/bolt/Core/BinaryBasicBlock.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_BINARY_BASIC_BLOCK_H
-#define LLVM_TOOLS_LLVM_BOLT_BINARY_BASIC_BLOCK_H
+#ifndef BOLT_CORE_BINARY_BASIC_BLOCK_H
+#define BOLT_CORE_BINARY_BASIC_BLOCK_H
 
 #include "llvm/ADT/GraphTraits.h"
 #include "llvm/ADT/StringRef.h"
diff --git a/bolt/include/bolt/Core/BinaryContext.h b/bolt/include/bolt/Core/BinaryContext.h
index e1603793e6b7..1f5d55f6dda8 100644
--- a/bolt/include/bolt/Core/BinaryContext.h
+++ b/bolt/include/bolt/Core/BinaryContext.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_BINARY_CONTEXT_H
-#define LLVM_TOOLS_LLVM_BOLT_BINARY_CONTEXT_H
+#ifndef BOLT_CORE_BINARY_CONTEXT_H
+#define BOLT_CORE_BINARY_CONTEXT_H
 
 #include "bolt/Core/BinaryData.h"
 #include "bolt/Core/BinarySection.h"
diff --git a/bolt/include/bolt/Core/BinaryData.h b/bolt/include/bolt/Core/BinaryData.h
index 563d30fc33c6..b8c4ce6e689e 100644
--- a/bolt/include/bolt/Core/BinaryData.h
+++ b/bolt/include/bolt/Core/BinaryData.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_BINARY_DATA_H
-#define LLVM_TOOLS_LLVM_BOLT_BINARY_DATA_H
+#ifndef BOLT_CORE_BINARY_DATA_H
+#define BOLT_CORE_BINARY_DATA_H
 
 #include "llvm/ADT/Twine.h"
 #include "llvm/MC/MCStreamer.h"
diff --git a/bolt/include/bolt/Core/BinaryEmitter.h b/bolt/include/bolt/Core/BinaryEmitter.h
index d6bc6077e764..39b4a28f7bcc 100644
--- a/bolt/include/bolt/Core/BinaryEmitter.h
+++ b/bolt/include/bolt/Core/BinaryEmitter.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_BINARY_EMITTER_H
-#define LLVM_TOOLS_LLVM_BOLT_BINARY_EMITTER_H
+#ifndef BOLT_CORE_BINARY_EMITTER_H
+#define BOLT_CORE_BINARY_EMITTER_H
 
 #include "llvm/ADT/StringRef.h"
 
diff --git a/bolt/include/bolt/Core/BinaryFunction.h b/bolt/include/bolt/Core/BinaryFunction.h
index e9e412482f09..de169026f0dc 100644
--- a/bolt/include/bolt/Core/BinaryFunction.h
+++ b/bolt/include/bolt/Core/BinaryFunction.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_BINARY_FUNCTION_H
-#define LLVM_TOOLS_LLVM_BOLT_BINARY_FUNCTION_H
+#ifndef BOLT_CORE_BINARY_FUNCTION_H
+#define BOLT_CORE_BINARY_FUNCTION_H
 
 #include "bolt/Core/BinaryBasicBlock.h"
 #include "bolt/Core/BinaryContext.h"
diff --git a/bolt/include/bolt/Core/BinaryLoop.h b/bolt/include/bolt/Core/BinaryLoop.h
index a09d75ed8fda..d9fdf09f2fed 100644
--- a/bolt/include/bolt/Core/BinaryLoop.h
+++ b/bolt/include/bolt/Core/BinaryLoop.h
@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_BINARY_LOOP_H
-#define LLVM_TOOLS_LLVM_BOLT_BINARY_LOOP_H
+#ifndef BOLT_CORE_BINARY_LOOP_H
+#define BOLT_CORE_BINARY_LOOP_H
 
 #include "llvm/ADT/DepthFirstIterator.h"
 #include "llvm/Analysis/LoopInfoImpl.h"
diff --git a/bolt/include/bolt/Core/BinarySection.h b/bolt/include/bolt/Core/BinarySection.h
index 2de6c8ab63cb..8d0c973c7a5e 100644
--- a/bolt/include/bolt/Core/BinarySection.h
+++ b/bolt/include/bolt/Core/BinarySection.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_BINARY_SECTION_H
-#define LLVM_TOOLS_LLVM_BOLT_BINARY_SECTION_H
+#ifndef BOLT_CORE_BINARY_SECTION_H
+#define BOLT_CORE_BINARY_SECTION_H
 
 #include "bolt/Core/DebugData.h"
 #include "bolt/Core/Relocation.h"
diff --git a/bolt/include/bolt/Core/DebugData.h b/bolt/include/bolt/Core/DebugData.h
index ca6a041a74c6..2e3dc36d181d 100644
--- a/bolt/include/bolt/Core/DebugData.h
+++ b/bolt/include/bolt/Core/DebugData.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_DEBUG_DATA_H
-#define LLVM_TOOLS_LLVM_BOLT_DEBUG_DATA_H
+#ifndef BOLT_CORE_DEBUG_DATA_H
+#define BOLT_CORE_DEBUG_DATA_H
 
 #include "llvm/ADT/MapVector.h"
 #include "llvm/ADT/SmallVector.h"
diff --git a/bolt/include/bolt/Core/DynoStats.h b/bolt/include/bolt/Core/DynoStats.h
index 6f666bd2b1f8..8250447740ab 100644
--- a/bolt/include/bolt/Core/DynoStats.h
+++ b/bolt/include/bolt/Core/DynoStats.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_DYNO_STATS_H
-#define LLVM_TOOLS_LLVM_BOLT_DYNO_STATS_H
+#ifndef BOLT_CORE_DYNO_STATS_H
+#define BOLT_CORE_DYNO_STATS_H
 
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/MC/MCInstPrinter.h"
diff --git a/bolt/include/bolt/Core/Exceptions.h b/bolt/include/bolt/Core/Exceptions.h
index 186b62f7ed6b..ca64c2aea3c0 100644
--- a/bolt/include/bolt/Core/Exceptions.h
+++ b/bolt/include/bolt/Core/Exceptions.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_EXCEPTIONS_H
-#define LLVM_TOOLS_LLVM_BOLT_EXCEPTIONS_H
+#ifndef BOLT_CORE_EXCEPTIONS_H
+#define BOLT_CORE_EXCEPTIONS_H
 
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/DebugInfo/DWARF/DWARFDataExtractor.h"
diff --git a/bolt/include/bolt/Core/JumpTable.h b/bolt/include/bolt/Core/JumpTable.h
index 0fd6a9282a4c..9bb83fe96fe9 100644
--- a/bolt/include/bolt/Core/JumpTable.h
+++ b/bolt/include/bolt/Core/JumpTable.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_JUMP_TABLE_H
-#define LLVM_TOOLS_LLVM_BOLT_JUMP_TABLE_H
+#ifndef BOLT_CORE_JUMP_TABLE_H
+#define BOLT_CORE_JUMP_TABLE_H
 
 #include "bolt/Core/BinaryData.h"
 #include <map>
diff --git a/bolt/include/bolt/Core/MCPlus.h b/bolt/include/bolt/Core/MCPlus.h
index 4efb7fc4dd73..2d92e15f8317 100644
--- a/bolt/include/bolt/Core/MCPlus.h
+++ b/bolt/include/bolt/Core/MCPlus.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_MCPLUS_H
-#define LLVM_TOOLS_LLVM_BOLT_MCPLUS_H
+#ifndef BOLT_CORE_MCPLUS_H
+#define BOLT_CORE_MCPLUS_H
 
 #include "llvm/CodeGen/TargetOpcodes.h"
 #include "llvm/MC/MCExpr.h"
diff --git a/bolt/include/bolt/Core/MCPlusBuilder.h b/bolt/include/bolt/Core/MCPlusBuilder.h
index 228879d5a102..3725bd4ea1a5 100644
--- a/bolt/include/bolt/Core/MCPlusBuilder.h
+++ b/bolt/include/bolt/Core/MCPlusBuilder.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_MCPLUSBUILDER_H
-#define LLVM_TOOLS_LLVM_BOLT_MCPLUSBUILDER_H
+#ifndef BOLT_CORE_MCPLUSBUILDER_H
+#define BOLT_CORE_MCPLUSBUILDER_H
 
 #include "bolt/Core/MCPlus.h"
 #include "bolt/Core/Relocation.h"
diff --git a/bolt/include/bolt/Core/ParallelUtilities.h b/bolt/include/bolt/Core/ParallelUtilities.h
index eb6cfc3ec563..26f4f5dbae29 100644
--- a/bolt/include/bolt/Core/ParallelUtilities.h
+++ b/bolt/include/bolt/Core/ParallelUtilities.h
@@ -12,8 +12,8 @@
 // If the NoThreads flags is passed, work will execute sequentially.
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PARALLEL_UTILITIES_H
-#define LLVM_TOOLS_LLVM_BOLT_PARALLEL_UTILITIES_H
+#ifndef BOLT_CORE_PARALLEL_UTILITIES_H
+#define BOLT_CORE_PARALLEL_UTILITIES_H
 
 #include "bolt/Core/MCPlusBuilder.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/bolt/include/bolt/Core/Relocation.h b/bolt/include/bolt/Core/Relocation.h
index 76416146827c..22681e76ae2a 100644
--- a/bolt/include/bolt/Core/Relocation.h
+++ b/bolt/include/bolt/Core/Relocation.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_RELOCATION_H
-#define LLVM_TOOLS_LLVM_BOLT_RELOCATION_H
+#ifndef BOLT_CORE_RELOCATION_H
+#define BOLT_CORE_RELOCATION_H
 
 #include "llvm/ADT/Triple.h"
 
diff --git a/bolt/include/bolt/Passes/ADRRelaxationPass.h b/bolt/include/bolt/Passes/ADRRelaxationPass.h
index 9c2d74485551..c5294bbb20b8 100644
--- a/bolt/include/bolt/Passes/ADRRelaxationPass.h
+++ b/bolt/include/bolt/Passes/ADRRelaxationPass.h
@@ -9,8 +9,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_ADRRELAXATIONPASS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_ADRRELAXATIONPASS_H
+#ifndef BOLT_PASSES_ADRRELAXATIONPASS_H
+#define BOLT_PASSES_ADRRELAXATIONPASS_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/Aligner.h b/bolt/include/bolt/Passes/Aligner.h
index ca5e859d6f97..9f241635561c 100644
--- a/bolt/include/bolt/Passes/Aligner.h
+++ b/bolt/include/bolt/Passes/Aligner.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_ALIGNER_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_ALIGNER_H
+#ifndef BOLT_PASSES_ALIGNER_H
+#define BOLT_PASSES_ALIGNER_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/AllocCombiner.h b/bolt/include/bolt/Passes/AllocCombiner.h
index 40cdf23a400e..b62a21d44a91 100644
--- a/bolt/include/bolt/Passes/AllocCombiner.h
+++ b/bolt/include/bolt/Passes/AllocCombiner.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_FRAMEDEFRAG_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_FRAMEDEFRAG_H
+#ifndef BOLT_PASSES_FRAMEDEFRAG_H
+#define BOLT_PASSES_FRAMEDEFRAG_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/AsmDump.h b/bolt/include/bolt/Passes/AsmDump.h
index 0722699a3c5d..0f9d164e24c2 100644
--- a/bolt/include/bolt/Passes/AsmDump.h
+++ b/bolt/include/bolt/Passes/AsmDump.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_ASMDUMP_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_ASMDUMP_H
+#ifndef BOLT_PASSES_ASMDUMP_H
+#define BOLT_PASSES_ASMDUMP_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/BinaryFunctionCallGraph.h b/bolt/include/bolt/Passes/BinaryFunctionCallGraph.h
index 1bb5724f3dad..093b41b571ab 100644
--- a/bolt/include/bolt/Passes/BinaryFunctionCallGraph.h
+++ b/bolt/include/bolt/Passes/BinaryFunctionCallGraph.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_BINARY_FUNCTION_CALLGRAPH_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_BINARY_FUNCTION_CALLGRAPH_H
+#ifndef BOLT_PASSES_BINARY_FUNCTION_CALLGRAPH_H
+#define BOLT_PASSES_BINARY_FUNCTION_CALLGRAPH_H
 
 #include "bolt/Passes/CallGraph.h"
 #include <deque>
diff --git a/bolt/include/bolt/Passes/BinaryPasses.h b/bolt/include/bolt/Passes/BinaryPasses.h
index a2eace7a05fe..9305d89d1e1c 100644
--- a/bolt/include/bolt/Passes/BinaryPasses.h
+++ b/bolt/include/bolt/Passes/BinaryPasses.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_BINARY_PASSES_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_BINARY_PASSES_H
+#ifndef BOLT_PASSES_BINARY_PASSES_H
+#define BOLT_PASSES_BINARY_PASSES_H
 
 #include "bolt/Core/BinaryContext.h"
 #include "bolt/Core/BinaryFunction.h"
diff --git a/bolt/include/bolt/Passes/CacheMetrics.h b/bolt/include/bolt/Passes/CacheMetrics.h
index 3e797b890bdc..ca543519604a 100644
--- a/bolt/include/bolt/Passes/CacheMetrics.h
+++ b/bolt/include/bolt/Passes/CacheMetrics.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_CACHEMETRICS_H
-#define LLVM_TOOLS_LLVM_BOLT_CACHEMETRICS_H
+#ifndef BOLT_PASSES_CACHEMETRICS_H
+#define BOLT_PASSES_CACHEMETRICS_H
 
 #include <cstdint>
 #include <vector>
@@ -39,4 +39,4 @@ double extTSPScore(uint64_t SrcAddr,
 } // namespace bolt
 } // namespace llvm
 
-#endif //LLVM_CACHEMETRICS_H
+#endif // BOLT_PASSES_CACHEMETRICS_H
diff --git a/bolt/include/bolt/Passes/CallGraph.h b/bolt/include/bolt/Passes/CallGraph.h
index 0df952da910d..a66fbb945588 100644
--- a/bolt/include/bolt/Passes/CallGraph.h
+++ b/bolt/include/bolt/Passes/CallGraph.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_CALLGRAPH_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_CALLGRAPH_H
+#ifndef BOLT_PASSES_CALLGRAPH_H
+#define BOLT_PASSES_CALLGRAPH_H
 
 #include <cassert>
 #include <cstdint>
diff --git a/bolt/include/bolt/Passes/CallGraphWalker.h b/bolt/include/bolt/Passes/CallGraphWalker.h
index be3dca300c30..8ba6d92a5464 100644
--- a/bolt/include/bolt/Passes/CallGraphWalker.h
+++ b/bolt/include/bolt/Passes/CallGraphWalker.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_CALLGRAPHWALKER_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_CALLGRAPHWALKER_H
+#ifndef BOLT_PASSES_CALLGRAPHWALKER_H
+#define BOLT_PASSES_CALLGRAPHWALKER_H
 
 #include <deque>
 #include <functional>
diff --git a/bolt/include/bolt/Passes/DataflowAnalysis.h b/bolt/include/bolt/Passes/DataflowAnalysis.h
index 2c8762c770e3..a17c54cf7644 100644
--- a/bolt/include/bolt/Passes/DataflowAnalysis.h
+++ b/bolt/include/bolt/Passes/DataflowAnalysis.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_DATAFLOWANALYSIS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_DATAFLOWANALYSIS_H
+#ifndef BOLT_PASSES_DATAFLOWANALYSIS_H
+#define BOLT_PASSES_DATAFLOWANALYSIS_H
 
 #include "bolt/Core/BinaryContext.h"
 #include "bolt/Core/BinaryFunction.h"
diff --git a/bolt/include/bolt/Passes/DataflowInfoManager.h b/bolt/include/bolt/Passes/DataflowInfoManager.h
index dd4c88de7ce0..ebc2bd012a20 100644
--- a/bolt/include/bolt/Passes/DataflowInfoManager.h
+++ b/bolt/include/bolt/Passes/DataflowInfoManager.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_DATAFLOWINFOMANAGER_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_DATAFLOWINFOMANAGER_H
+#ifndef BOLT_PASSES_DATAFLOWINFOMANAGER_H
+#define BOLT_PASSES_DATAFLOWINFOMANAGER_H
 
 #include "bolt/Passes/DominatorAnalysis.h"
 #include "bolt/Passes/LivenessAnalysis.h"
diff --git a/bolt/include/bolt/Passes/DominatorAnalysis.h b/bolt/include/bolt/Passes/DominatorAnalysis.h
index efe1dab3495d..1a8530a20e53 100644
--- a/bolt/include/bolt/Passes/DominatorAnalysis.h
+++ b/bolt/include/bolt/Passes/DominatorAnalysis.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_DOMINATORANALYSIS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_DOMINATORANALYSIS_H
+#ifndef BOLT_PASSES_DOMINATORANALYSIS_H
+#define BOLT_PASSES_DOMINATORANALYSIS_H
 
 #include "bolt/Passes/DataflowAnalysis.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/bolt/include/bolt/Passes/FrameAnalysis.h b/bolt/include/bolt/Passes/FrameAnalysis.h
index 5db8965555fb..7dc3eac23fe8 100644
--- a/bolt/include/bolt/Passes/FrameAnalysis.h
+++ b/bolt/include/bolt/Passes/FrameAnalysis.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_FRAMEANALYSIS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_FRAMEANALYSIS_H
+#ifndef BOLT_PASSES_FRAMEANALYSIS_H
+#define BOLT_PASSES_FRAMEANALYSIS_H
 
 #include "bolt/Passes/StackPointerTracking.h"
 
diff --git a/bolt/include/bolt/Passes/FrameOptimizer.h b/bolt/include/bolt/Passes/FrameOptimizer.h
index ff710924aaab..e1be0eb86b2f 100644
--- a/bolt/include/bolt/Passes/FrameOptimizer.h
+++ b/bolt/include/bolt/Passes/FrameOptimizer.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_FRAMEOPTIMIZER_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_FRAMEOPTIMIZER_H
+#ifndef BOLT_PASSES_FRAMEOPTIMIZER_H
+#define BOLT_PASSES_FRAMEOPTIMIZER_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/HFSort.h b/bolt/include/bolt/Passes/HFSort.h
index 64634c86f0ec..9d09f20624db 100644
--- a/bolt/include/bolt/Passes/HFSort.h
+++ b/bolt/include/bolt/Passes/HFSort.h
@@ -33,8 +33,8 @@
    +----------------------------------------------------------------------+
 */
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_HFSORT_H
-#define LLVM_TOOLS_LLVM_BOLT_HFSORT_H
+#ifndef BOLT_PASSES_HFSORT_H
+#define BOLT_PASSES_HFSORT_H
 
 #include "bolt/Passes/CallGraph.h"
 
@@ -116,7 +116,7 @@ std::vector<Cluster> pettisAndHansen(const CallGraph &Cg);
 /* Group functions into clusters randomly. */
 std::vector<Cluster> randomClusters(const CallGraph &Cg);
 
-}
-}
+} // end namespace bolt
+} // end namespace llvm
 
-#endif
+#endif // BOLT_PASSES_HFSORT_H
diff --git a/bolt/include/bolt/Passes/IdenticalCodeFolding.h b/bolt/include/bolt/Passes/IdenticalCodeFolding.h
index e5dae332e604..13e26598c0fa 100644
--- a/bolt/include/bolt/Passes/IdenticalCodeFolding.h
+++ b/bolt/include/bolt/Passes/IdenticalCodeFolding.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_IDENTICAL_CODE_FOLDING_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_IDENTICAL_CODE_FOLDING_H
+#ifndef BOLT_PASSES_IDENTICAL_CODE_FOLDING_H
+#define BOLT_PASSES_IDENTICAL_CODE_FOLDING_H
 
 #include "bolt/Core/BinaryFunction.h"
 #include "bolt/Passes/BinaryPasses.h"
diff --git a/bolt/include/bolt/Passes/IndirectCallPromotion.h b/bolt/include/bolt/Passes/IndirectCallPromotion.h
index 4163ba658e6c..30eae48b7f3f 100644
--- a/bolt/include/bolt/Passes/IndirectCallPromotion.h
+++ b/bolt/include/bolt/Passes/IndirectCallPromotion.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_INDIRECT_CALL_PROMOTION_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_INDIRECT_CALL_PROMOTION_H
+#ifndef BOLT_PASSES_INDIRECT_CALL_PROMOTION_H
+#define BOLT_PASSES_INDIRECT_CALL_PROMOTION_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/Inliner.h b/bolt/include/bolt/Passes/Inliner.h
index 64926743b9a6..bb656c9aac56 100644
--- a/bolt/include/bolt/Passes/Inliner.h
+++ b/bolt/include/bolt/Passes/Inliner.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_INLINER_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_INLINER_H
+#ifndef BOLT_PASSES_INLINER_H
+#define BOLT_PASSES_INLINER_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/Instrumentation.h b/bolt/include/bolt/Passes/Instrumentation.h
index 87a0596274bc..c9cc03ee8546 100644
--- a/bolt/include/bolt/Passes/Instrumentation.h
+++ b/bolt/include/bolt/Passes/Instrumentation.h
@@ -13,8 +13,8 @@
 // runtime/instr.cpp
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_INSTRUMENTATION_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_INSTRUMENTATION_H
+#ifndef BOLT_PASSES_INSTRUMENTATION_H
+#define BOLT_PASSES_INSTRUMENTATION_H
 
 #include "bolt/Passes/BinaryPasses.h"
 #include "bolt/Passes/InstrumentationSummary.h"
diff --git a/bolt/include/bolt/Passes/InstrumentationSummary.h b/bolt/include/bolt/Passes/InstrumentationSummary.h
index ac878872a95b..f73a883f83ab 100644
--- a/bolt/include/bolt/Passes/InstrumentationSummary.h
+++ b/bolt/include/bolt/Passes/InstrumentationSummary.h
@@ -10,8 +10,8 @@
 // binary emit and linking.
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_INSTRUMENTATION_SUMMARY_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_INSTRUMENTATION_SUMMARY_H
+#ifndef BOLT_PASSES_INSTRUMENTATION_SUMMARY_H
+#define BOLT_PASSES_INSTRUMENTATION_SUMMARY_H
 
 #include "llvm/ADT/DenseSet.h"
 #include <vector>
diff --git a/bolt/include/bolt/Passes/JTFootprintReduction.h b/bolt/include/bolt/Passes/JTFootprintReduction.h
index 22724b048b37..298be37d594c 100644
--- a/bolt/include/bolt/Passes/JTFootprintReduction.h
+++ b/bolt/include/bolt/Passes/JTFootprintReduction.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_JT_FOOTPRINT_REDUCTION_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_JT_FOOTPRINT_REDUCTION_H
+#ifndef BOLT_PASSES_JT_FOOTPRINT_REDUCTION_H
+#define BOLT_PASSES_JT_FOOTPRINT_REDUCTION_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/LivenessAnalysis.h b/bolt/include/bolt/Passes/LivenessAnalysis.h
index b9509988640e..c7640d58eab0 100644
--- a/bolt/include/bolt/Passes/LivenessAnalysis.h
+++ b/bolt/include/bolt/Passes/LivenessAnalysis.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_LIVENESSANALYSIS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_LIVENESSANALYSIS_H
+#ifndef BOLT_PASSES_LIVENESSANALYSIS_H
+#define BOLT_PASSES_LIVENESSANALYSIS_H
 
 #include "bolt/Passes/DataflowAnalysis.h"
 #include "bolt/Passes/RegAnalysis.h"
diff --git a/bolt/include/bolt/Passes/LongJmp.h b/bolt/include/bolt/Passes/LongJmp.h
index acbb7187215f..618a590c9117 100644
--- a/bolt/include/bolt/Passes/LongJmp.h
+++ b/bolt/include/bolt/Passes/LongJmp.h
@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_LONGJMP_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_LONGJMP_H
+#ifndef BOLT_PASSES_LONGJMP_H
+#define BOLT_PASSES_LONGJMP_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/LoopInversionPass.h b/bolt/include/bolt/Passes/LoopInversionPass.h
index 462c8dcde1a5..10a10f8efeb0 100644
--- a/bolt/include/bolt/Passes/LoopInversionPass.h
+++ b/bolt/include/bolt/Passes/LoopInversionPass.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_LOOPINVERSION_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_LOOPINVERSION_H
+#ifndef BOLT_PASSES_LOOPINVERSION_H
+#define BOLT_PASSES_LOOPINVERSION_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/MCF.h b/bolt/include/bolt/Passes/MCF.h
index 69268ba2643c..ee5b8f6b82d1 100644
--- a/bolt/include/bolt/Passes/MCF.h
+++ b/bolt/include/bolt/Passes/MCF.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_MCF_H
-#define LLVM_TOOLS_LLVM_BOLT_MCF_H
+#ifndef BOLT_PASSES_MCF_H
+#define BOLT_PASSES_MCF_H
 
 namespace llvm {
 namespace bolt {
@@ -44,8 +44,7 @@ void estimateEdgeCounts(BinaryFunction &BF);
 /// that do not account for them.
 void solveMCF(BinaryFunction &BF, MCFCostFunction CostFunction);
 
-}
-}
+} // end namespace bolt
+} // end namespace llvm
 
-
-#endif
+#endif // BOLT_PASSES_MCF_H
diff --git a/bolt/include/bolt/Passes/PLTCall.h b/bolt/include/bolt/Passes/PLTCall.h
index 2b238d3cdbee..1c7a508b0d9b 100644
--- a/bolt/include/bolt/Passes/PLTCall.h
+++ b/bolt/include/bolt/Passes/PLTCall.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_PLTCALL_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_PLTCALL_H
+#ifndef BOLT_PASSES_PLTCALL_H
+#define BOLT_PASSES_PLTCALL_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/PatchEntries.h b/bolt/include/bolt/Passes/PatchEntries.h
index 9e7ff00f1519..720a095c183d 100644
--- a/bolt/include/bolt/Passes/PatchEntries.h
+++ b/bolt/include/bolt/Passes/PatchEntries.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_PATCH_ENTRIES_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_PATCH_ENTRIES_H
+#ifndef BOLT_PASSES_PATCH_ENTRIES_H
+#define BOLT_PASSES_PATCH_ENTRIES_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/ReachingDefOrUse.h b/bolt/include/bolt/Passes/ReachingDefOrUse.h
index e4a8595c54ef..d0c81a0d6cfc 100644
--- a/bolt/include/bolt/Passes/ReachingDefOrUse.h
+++ b/bolt/include/bolt/Passes/ReachingDefOrUse.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_REACHINGDEFORUSE_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_REACHINGDEFORUSE_H
+#ifndef BOLT_PASSES_REACHINGDEFORUSE_H
+#define BOLT_PASSES_REACHINGDEFORUSE_H
 
 #include "bolt/Passes/DataflowAnalysis.h"
 #include "bolt/Passes/RegAnalysis.h"
diff --git a/bolt/include/bolt/Passes/ReachingInsns.h b/bolt/include/bolt/Passes/ReachingInsns.h
index 24f1b22bbb72..666d219cfbaf 100644
--- a/bolt/include/bolt/Passes/ReachingInsns.h
+++ b/bolt/include/bolt/Passes/ReachingInsns.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_REACHINGINSNS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_REACHINGINSNS_H
+#ifndef BOLT_PASSES_REACHINGINSNS_H
+#define BOLT_PASSES_REACHINGINSNS_H
 
 #include "bolt/Passes/DataflowAnalysis.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/bolt/include/bolt/Passes/RegAnalysis.h b/bolt/include/bolt/Passes/RegAnalysis.h
index a363ba1996b4..17654db5de24 100644
--- a/bolt/include/bolt/Passes/RegAnalysis.h
+++ b/bolt/include/bolt/Passes/RegAnalysis.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_REGANALYSIS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_REGANALYSIS_H
+#ifndef BOLT_PASSES_REGANALYSIS_H
+#define BOLT_PASSES_REGANALYSIS_H
 
 #include "llvm/ADT/BitVector.h"
 #include <cstdint>
diff --git a/bolt/include/bolt/Passes/RegReAssign.h b/bolt/include/bolt/Passes/RegReAssign.h
index e703fb1bd0bc..6a309e061bcb 100644
--- a/bolt/include/bolt/Passes/RegReAssign.h
+++ b/bolt/include/bolt/Passes/RegReAssign.h
@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_REGREASSIGN_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_REGREASSIGN_H
+#ifndef BOLT_PASSES_REGREASSIGN_H
+#define BOLT_PASSES_REGREASSIGN_H
 
 #include "bolt/Passes/BinaryPasses.h"
 #include "bolt/Passes/RegAnalysis.h"
diff --git a/bolt/include/bolt/Passes/ReorderAlgorithm.h b/bolt/include/bolt/Passes/ReorderAlgorithm.h
index 5212e625d3cb..4664ed7d109f 100644
--- a/bolt/include/bolt/Passes/ReorderAlgorithm.h
+++ b/bolt/include/bolt/Passes/ReorderAlgorithm.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_REORDER_ALGORITHM_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_REORDER_ALGORITHM_H
+#ifndef BOLT_PASSES_REORDER_ALGORITHM_H
+#define BOLT_PASSES_REORDER_ALGORITHM_H
 
 #include "bolt/Core/BinaryFunction.h"
 #include <memory>
diff --git a/bolt/include/bolt/Passes/ReorderData.h b/bolt/include/bolt/Passes/ReorderData.h
index 67ca440dbe46..0489ce8076b4 100644
--- a/bolt/include/bolt/Passes/ReorderData.h
+++ b/bolt/include/bolt/Passes/ReorderData.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_REORDER_DATA_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_REORDER_DATA_H
+#ifndef BOLT_PASSES_REORDER_DATA_H
+#define BOLT_PASSES_REORDER_DATA_H
 
 #include "bolt/Passes/BinaryPasses.h"
 #include <unordered_map>
diff --git a/bolt/include/bolt/Passes/ReorderFunctions.h b/bolt/include/bolt/Passes/ReorderFunctions.h
index 028f3c3dc87b..de2b3b986e06 100644
--- a/bolt/include/bolt/Passes/ReorderFunctions.h
+++ b/bolt/include/bolt/Passes/ReorderFunctions.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_REORDER_FNCTIONS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_REORDER_FNCTIONS_H
+#ifndef BOLT_PASSES_REORDER_FUNCTIONS_H
+#define BOLT_PASSES_REORDER_FUNCTIONS_H
 
 #include "bolt/Passes/BinaryFunctionCallGraph.h"
 #include "bolt/Passes/BinaryPasses.h"
@@ -47,4 +47,4 @@ public:
 } // namespace bolt
 } // namespace llvm
 
-#endif
+#endif // BOLT_PASSES_REORDER_FUNCTIONS_H
diff --git a/bolt/include/bolt/Passes/ReorderUtils.h b/bolt/include/bolt/Passes/ReorderUtils.h
index d966ec578a93..cc3cea37a187 100644
--- a/bolt/include/bolt/Passes/ReorderUtils.h
+++ b/bolt/include/bolt/Passes/ReorderUtils.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_REORDER_UTILS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_REORDER_UTILS_H
+#ifndef BOLT_PASSES_REORDER_UTILS_H
+#define BOLT_PASSES_REORDER_UTILS_H
 
 #include <memory>
 #include <vector>
diff --git a/bolt/include/bolt/Passes/RetpolineInsertion.h b/bolt/include/bolt/Passes/RetpolineInsertion.h
index 75dcb4d67c91..a65bdaf68d7c 100644
--- a/bolt/include/bolt/Passes/RetpolineInsertion.h
+++ b/bolt/include/bolt/Passes/RetpolineInsertion.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_RETPOLINE_INSERTION_H
-#define LLVM_TOOLS_LLVM_BOLT_RETPOLINE_INSERTION_H
+#ifndef BOLT_PASSES_RETPOLINE_INSERTION_H
+#define BOLT_PASSES_RETPOLINE_INSERTION_H
 
 #include "bolt/Passes/BinaryPasses.h"
 #include <string>
@@ -73,7 +73,8 @@ public:
 
   void runOnFunctions(BinaryContext &BC) override;
 };
+
 } // namespace bolt
 } // namespace llvm
 
-#endif
+#endif // BOLT_PASSES_RETPOLINE_INSERTION_H
diff --git a/bolt/include/bolt/Passes/ShrinkWrapping.h b/bolt/include/bolt/Passes/ShrinkWrapping.h
index 1e1ff0886e56..45a9ee89aab3 100644
--- a/bolt/include/bolt/Passes/ShrinkWrapping.h
+++ b/bolt/include/bolt/Passes/ShrinkWrapping.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_SHRINKWRAPPING_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_SHRINKWRAPPING_H
+#ifndef BOLT_PASSES_SHRINKWRAPPING_H
+#define BOLT_PASSES_SHRINKWRAPPING_H
 
 #include "bolt/Passes/FrameAnalysis.h"
 
diff --git a/bolt/include/bolt/Passes/SplitFunctions.h b/bolt/include/bolt/Passes/SplitFunctions.h
index 583991029c63..930429fe3794 100644
--- a/bolt/include/bolt/Passes/SplitFunctions.h
+++ b/bolt/include/bolt/Passes/SplitFunctions.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_SPLIT_FUNCTIONS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_SPLIT_FUNCTIONS_H
+#ifndef BOLT_PASSES_SPLIT_FUNCTIONS_H
+#define BOLT_PASSES_SPLIT_FUNCTIONS_H
 
 #include "bolt/Passes/BinaryPasses.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/bolt/include/bolt/Passes/StackAllocationAnalysis.h b/bolt/include/bolt/Passes/StackAllocationAnalysis.h
index 30bbbfe290cd..3c1b96a424b0 100644
--- a/bolt/include/bolt/Passes/StackAllocationAnalysis.h
+++ b/bolt/include/bolt/Passes/StackAllocationAnalysis.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_STACKALLOCATIONANALYSIS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_STACKALLOCATIONANALYSIS_H
+#ifndef BOLT_PASSES_STACKALLOCATIONANALYSIS_H
+#define BOLT_PASSES_STACKALLOCATIONANALYSIS_H
 
 #include "bolt/Passes/DataflowAnalysis.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/bolt/include/bolt/Passes/StackAvailableExpressions.h b/bolt/include/bolt/Passes/StackAvailableExpressions.h
index 914b3e6a64c2..ef2a58b27135 100644
--- a/bolt/include/bolt/Passes/StackAvailableExpressions.h
+++ b/bolt/include/bolt/Passes/StackAvailableExpressions.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_STACKAVAILABLEEXPRESSIONS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_STACKAVAILABLEEXPRESSIONS_H
+#ifndef BOLT_PASSES_STACKAVAILABLEEXPRESSIONS_H
+#define BOLT_PASSES_STACKAVAILABLEEXPRESSIONS_H
 
 #include "bolt/Passes/DataflowAnalysis.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/bolt/include/bolt/Passes/StackPointerTracking.h b/bolt/include/bolt/Passes/StackPointerTracking.h
index 5480103eeb00..76d2d088298c 100644
--- a/bolt/include/bolt/Passes/StackPointerTracking.h
+++ b/bolt/include/bolt/Passes/StackPointerTracking.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_STACKPOINTERTRACKING_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_STACKPOINTERTRACKING_H
+#ifndef BOLT_PASSES_STACKPOINTERTRACKING_H
+#define BOLT_PASSES_STACKPOINTERTRACKING_H
 
 #include "bolt/Passes/DataflowAnalysis.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/bolt/include/bolt/Passes/StackReachingUses.h b/bolt/include/bolt/Passes/StackReachingUses.h
index c11068c69424..6272b636fa3a 100644
--- a/bolt/include/bolt/Passes/StackReachingUses.h
+++ b/bolt/include/bolt/Passes/StackReachingUses.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_STACKREACHINGUSES_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_STACKREACHINGUSES_H
+#ifndef BOLT_PASSES_STACKREACHINGUSES_H
+#define BOLT_PASSES_STACKREACHINGUSES_H
 
 #include "bolt/Passes/DataflowAnalysis.h"
 #include "llvm/Support/CommandLine.h"
diff --git a/bolt/include/bolt/Passes/StokeInfo.h b/bolt/include/bolt/Passes/StokeInfo.h
index a6f802d18b9b..883248fb2373 100644
--- a/bolt/include/bolt/Passes/StokeInfo.h
+++ b/bolt/include/bolt/Passes/StokeInfo.h
@@ -22,8 +22,8 @@
 //  Finally, these configure files are feed to the Stoke to do the job.
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_STOKEINFO_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_STOKEINFO_H
+#ifndef BOLT_PASSES_STOKEINFO_H
+#define BOLT_PASSES_STOKEINFO_H
 
 #include "bolt/Passes/BinaryPasses.h"
 #include <fstream>
diff --git a/bolt/include/bolt/Passes/TailDuplication.h b/bolt/include/bolt/Passes/TailDuplication.h
index 333e7cc7eccd..a3e4f5604362 100644
--- a/bolt/include/bolt/Passes/TailDuplication.h
+++ b/bolt/include/bolt/Passes/TailDuplication.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_TAILDUPLICATION_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_TAILDUPLICATION_H
+#ifndef BOLT_PASSES_TAILDUPLICATION_H
+#define BOLT_PASSES_TAILDUPLICATION_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/ThreeWayBranch.h b/bolt/include/bolt/Passes/ThreeWayBranch.h
index 8128a42b1f79..c501725fae33 100644
--- a/bolt/include/bolt/Passes/ThreeWayBranch.h
+++ b/bolt/include/bolt/Passes/ThreeWayBranch.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_THREEWAYBRANCH_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_THREEWAYBRANCH_H
+#ifndef BOLT_PASSES_THREEWAYBRANCH_H
+#define BOLT_PASSES_THREEWAYBRANCH_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/ValidateInternalCalls.h b/bolt/include/bolt/Passes/ValidateInternalCalls.h
index e728e9e8d3f6..dc1fb8367c20 100644
--- a/bolt/include/bolt/Passes/ValidateInternalCalls.h
+++ b/bolt/include/bolt/Passes/ValidateInternalCalls.h
@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_TOOLS_LLVM_BOLT_PASSES_VALIDATEINTERNALCALLS_H
-#define LLVM_TOOLS_LLVM_BOLT_PASSES_VALIDATEINTERNALCALLS_H
+#ifndef BOLT_PASSES_VALIDATEINTERNALCALLS_H
+#define BOLT_PASSES_VALIDATEINTERNALCALLS_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
diff --git a/bolt/include/bolt/Passes/VeneerElimination.h b/bolt/include/bolt/Passes/VeneerElimination.h
index 008cd7811d2b..b3a735fd3b89 100644
--- a/bolt/include/bolt/Passes/VeneerElimination.h
+++ b/bolt/include/bolt/Passes/VeneerElimination.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_VENEER_ELIMINATION_H
-#define LLVM_TOOLS_LLVM_BOLT_VENEER_ELIMINATION_H
+#ifndef BOLT_PASSES_VENEER_ELIMINATION_H
+#define BOLT_PASSES_VENEER_ELIMINATION_H
 
 #include "bolt/Passes/BinaryPasses.h"
 
@@ -28,7 +28,8 @@ public:
 
   void runOnFunctions(BinaryContext &BC) override;
 };
+
 } // namespace bolt
 } // namespace llvm
 
-#endif
+#endif // BOLT_PASSES_VENEER_ELIMINATION_H
diff --git a/bolt/include/bolt/Profile/BoltAddressTranslation.h b/bolt/include/bolt/Profile/BoltAddressTranslation.h
index c0b553158eea..404b54ce21e6 100644
--- a/bolt/include/bolt/Profile/BoltAddressTranslation.h
+++ b/bolt/include/bolt/Profile/BoltAddressTranslation.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_BOLTADDRESSTRANSLATION_H
-#define LLVM_TOOLS_LLVM_BOLT_BOLTADDRESSTRANSLATION_H
+#ifndef BOLT_PROFILE_BOLTADDRESSTRANSLATION_H
+#define BOLT_PROFILE_BOLTADDRESSTRANSLATION_H
 
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/SmallVector.h"
diff --git a/bolt/include/bolt/Profile/DataAggregator.h b/bolt/include/bolt/Profile/DataAggregator.h
index ef3ab06c7894..8296ba71d842 100644
--- a/bolt/include/bolt/Profile/DataAggregator.h
+++ b/bolt/include/bolt/Profile/DataAggregator.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_DATA_AGGREGATOR_H
-#define LLVM_TOOLS_LLVM_BOLT_DATA_AGGREGATOR_H
+#ifndef BOLT_PROFILE_DATA_AGGREGATOR_H
+#define BOLT_PROFILE_DATA_AGGREGATOR_H
 
 #include "bolt/Profile/DataReader.h"
 #include "llvm/ADT/StringRef.h"
diff --git a/bolt/include/bolt/Profile/DataReader.h b/bolt/include/bolt/Profile/DataReader.h
index 4e64924f2943..53857ca31264 100644
--- a/bolt/include/bolt/Profile/DataReader.h
+++ b/bolt/include/bolt/Profile/DataReader.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_DATA_READER_H
-#define LLVM_TOOLS_LLVM_BOLT_DATA_READER_H
+#ifndef BOLT_PROFILE_DATA_READER_H
+#define BOLT_PROFILE_DATA_READER_H
 
 #include "bolt/Profile/ProfileReaderBase.h"
 #include "llvm/ADT/DenseMap.h"
diff --git a/bolt/include/bolt/Profile/Heatmap.h b/bolt/include/bolt/Profile/Heatmap.h
index 71144119c62e..f2471d7fef95 100644
--- a/bolt/include/bolt/Profile/Heatmap.h
+++ b/bolt/include/bolt/Profile/Heatmap.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_HEATMAP_H
-#define LLVM_TOOLS_LLVM_BOLT_HEATMAP_H
+#ifndef BOLT_PROFILE_HEATMAP_H
+#define BOLT_PROFILE_HEATMAP_H
 
 #include "llvm/ADT/StringRef.h"
 #include <cstdint>
diff --git a/bolt/include/bolt/Profile/ProfileReaderBase.h b/bolt/include/bolt/Profile/ProfileReaderBase.h
index 21dcfe7215b9..fa9455d470f2 100644
--- a/bolt/include/bolt/Profile/ProfileReaderBase.h
+++ b/bolt/include/bolt/Profile/ProfileReaderBase.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PROFILE_READER_BASE_H
-#define LLVM_TOOLS_LLVM_BOLT_PROFILE_READER_BASE_H
+#ifndef BOLT_PROFILE_PROFILE_READER_BASE_H
+#define BOLT_PROFILE_PROFILE_READER_BASE_H
 
 #include "llvm/ADT/StringSet.h"
 #include "llvm/Support/Error.h"
diff --git a/bolt/include/bolt/Profile/ProfileYAMLMapping.h b/bolt/include/bolt/Profile/ProfileYAMLMapping.h
index 465eb62de60f..d46686dcf783 100644
--- a/bolt/include/bolt/Profile/ProfileYAMLMapping.h
+++ b/bolt/include/bolt/Profile/ProfileYAMLMapping.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_PROFILEYAMLMAPPING_H
-#define LLVM_TOOLS_LLVM_BOLT_PROFILEYAMLMAPPING_H
+#ifndef BOLT_PROFILE_PROFILEYAMLMAPPING_H
+#define BOLT_PROFILE_PROFILEYAMLMAPPING_H
 
 #include "bolt/Core/BinaryFunction.h"
 #include "llvm/ADT/StringRef.h"
diff --git a/bolt/include/bolt/Profile/YAMLProfileReader.h b/bolt/include/bolt/Profile/YAMLProfileReader.h
index 4e99dc42f584..8934f270920f 100644
--- a/bolt/include/bolt/Profile/YAMLProfileReader.h
+++ b/bolt/include/bolt/Profile/YAMLProfileReader.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_YAML_PROFILE_READER_H
-#define LLVM_TOOLS_LLVM_BOLT_YAML_PROFILE_READER_H
+#ifndef BOLT_PROFILE_YAML_PROFILE_READER_H
+#define BOLT_PROFILE_YAML_PROFILE_READER_H
 
 #include "bolt/Profile/ProfileReaderBase.h"
 #include "bolt/Profile/ProfileYAMLMapping.h"
diff --git a/bolt/include/bolt/Profile/YAMLProfileWriter.h b/bolt/include/bolt/Profile/YAMLProfileWriter.h
index 65b72588d85a..9d52bbc3c2e9 100644
--- a/bolt/include/bolt/Profile/YAMLProfileWriter.h
+++ b/bolt/include/bolt/Profile/YAMLProfileWriter.h
@@ -9,9 +9,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-
-#ifndef LLVM_TOOLS_LLVM_BOLT_YAML_PROFILE_WRITER_H
-#define LLVM_TOOLS_LLVM_BOLT_YAML_PROFILE_WRITER_H
+#ifndef BOLT_PROFILE_YAML_PROFILE_WRITER_H
+#define BOLT_PROFILE_YAML_PROFILE_WRITER_H
 
 #include "llvm/Support/raw_ostream.h"
 #include <system_error>
diff --git a/bolt/include/bolt/Rewrite/BinaryPassManager.h b/bolt/include/bolt/Rewrite/BinaryPassManager.h
index 7827cf875b23..d773d6e3678c 100644
--- a/bolt/include/bolt/Rewrite/BinaryPassManager.h
+++ b/bolt/include/bolt/Rewrite/BinaryPassManager.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_BINARY_FUNCTION_PASS_MANAGER_H
-#define LLVM_TOOLS_LLVM_BOLT_BINARY_FUNCTION_PASS_MANAGER_H
+#ifndef BOLT_REWRITE_BINARY_PASS_MANAGER_H
+#define BOLT_REWRITE_BINARY_PASS_MANAGER_H
 
 #include "bolt/Passes/BinaryPasses.h"
 #include <memory>
@@ -57,4 +57,4 @@ private:
 } // namespace bolt
 } // namespace llvm
 
-#endif
+#endif // BOLT_REWRITE_BINARY_PASS_MANAGER_H
diff --git a/bolt/include/bolt/Rewrite/DWARFRewriter.h b/bolt/include/bolt/Rewrite/DWARFRewriter.h
index 088e7601fd3a..8137f8fbfa05 100644
--- a/bolt/include/bolt/Rewrite/DWARFRewriter.h
+++ b/bolt/include/bolt/Rewrite/DWARFRewriter.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_DWARF_REWRITER_H
-#define LLVM_TOOLS_LLVM_BOLT_DWARF_REWRITER_H
+#ifndef BOLT_REWRITE_DWARF_REWRITER_H
+#define BOLT_REWRITE_DWARF_REWRITER_H
 
 #include "bolt/Core/DebugData.h"
 #include "bolt/Rewrite/RewriteInstance.h"
diff --git a/bolt/include/bolt/Rewrite/ExecutableFileMemoryManager.h b/bolt/include/bolt/Rewrite/ExecutableFileMemoryManager.h
index 3ca60192a43f..4974559a8c2f 100644
--- a/bolt/include/bolt/Rewrite/ExecutableFileMemoryManager.h
+++ b/bolt/include/bolt/Rewrite/ExecutableFileMemoryManager.h
@@ -8,8 +8,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_EXECUTABLE_FILE_MEMORY_MANAGER_H
-#define LLVM_TOOLS_LLVM_BOLT_EXECUTABLE_FILE_MEMORY_MANAGER_H
+#ifndef BOLT_REWRITE_EXECUTABLE_FILE_MEMORY_MANAGER_H
+#define BOLT_REWRITE_EXECUTABLE_FILE_MEMORY_MANAGER_H
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ExecutionEngine/SectionMemoryManager.h"
diff --git a/bolt/include/bolt/Rewrite/MachORewriteInstance.h b/bolt/include/bolt/Rewrite/MachORewriteInstance.h
index cf6b8b1247ed..02eb7810db21 100644
--- a/bolt/include/bolt/Rewrite/MachORewriteInstance.h
+++ b/bolt/include/bolt/Rewrite/MachORewriteInstance.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_MACHO_REWRITE_INSTANCE_H
-#define LLVM_TOOLS_LLVM_BOLT_MACHO_REWRITE_INSTANCE_H
+#ifndef BOLT_REWRITE_MACHO_REWRITE_INSTANCE_H
+#define BOLT_REWRITE_MACHO_REWRITE_INSTANCE_H
 
 #include "bolt/Utils/NameResolver.h"
 #include "llvm/Support/Error.h"
diff --git a/bolt/include/bolt/Rewrite/RewriteInstance.h b/bolt/include/bolt/Rewrite/RewriteInstance.h
index 533aa2996494..171c1babc134 100644
--- a/bolt/include/bolt/Rewrite/RewriteInstance.h
+++ b/bolt/include/bolt/Rewrite/RewriteInstance.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_REWRITE_INSTANCE_H
-#define LLVM_TOOLS_LLVM_BOLT_REWRITE_INSTANCE_H
+#ifndef BOLT_REWRITE_REWRITE_INSTANCE_H
+#define BOLT_REWRITE_REWRITE_INSTANCE_H
 
 #include "bolt/Core/BinaryContext.h"
 #include "bolt/Utils/NameResolver.h"
diff --git a/bolt/include/bolt/RuntimeLibs/HugifyRuntimeLibrary.h b/bolt/include/bolt/RuntimeLibs/HugifyRuntimeLibrary.h
index 2c7c2f919e41..b9fcef49aac5 100644
--- a/bolt/include/bolt/RuntimeLibs/HugifyRuntimeLibrary.h
+++ b/bolt/include/bolt/RuntimeLibs/HugifyRuntimeLibrary.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_HUGIFY_RUNTIME_LIBRARY_H
-#define LLVM_TOOLS_LLVM_BOLT_HUGIFY_RUNTIME_LIBRARY_H
+#ifndef BOLT_RUNTIMELIBS_HUGIFY_RUNTIME_LIBRARY_H
+#define BOLT_RUNTIMELIBS_HUGIFY_RUNTIME_LIBRARY_H
 
 #include "bolt/RuntimeLibs/RuntimeLibrary.h"
 
diff --git a/bolt/include/bolt/RuntimeLibs/InstrumentationRuntimeLibrary.h b/bolt/include/bolt/RuntimeLibs/InstrumentationRuntimeLibrary.h
index 4bee69c1bac2..ec18a6fa2f37 100644
--- a/bolt/include/bolt/RuntimeLibs/InstrumentationRuntimeLibrary.h
+++ b/bolt/include/bolt/RuntimeLibs/InstrumentationRuntimeLibrary.h
@@ -6,8 +6,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_INSTRUMENTATION_RUNTIME_LIBRARY_H
-#define LLVM_TOOLS_LLVM_BOLT_INSTRUMENTATION_RUNTIME_LIBRARY_H
+#ifndef BOLT_RUNTIMELIBS_INSTRUMENTATION_RUNTIME_LIBRARY_H
+#define BOLT_RUNTIMELIBS_INSTRUMENTATION_RUNTIME_LIBRARY_H
 
 #include "bolt/Passes/InstrumentationSummary.h"
 #include "bolt/RuntimeLibs/RuntimeLibrary.h"
diff --git a/bolt/include/bolt/RuntimeLibs/RuntimeLibrary.h b/bolt/include/bolt/RuntimeLibs/RuntimeLibrary.h
index 4451a3c6401b..e07d3a39541c 100644
--- a/bolt/include/bolt/RuntimeLibs/RuntimeLibrary.h
+++ b/bolt/include/bolt/RuntimeLibs/RuntimeLibrary.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_LINKRUNTIME_H
-#define LLVM_TOOLS_LLVM_BOLT_LINKRUNTIME_H
+#ifndef BOLT_RUNTIMELIBS_RUNTIME_LIBRARY_H
+#define BOLT_RUNTIMELIBS_RUNTIME_LIBRARY_H
 
 #include <llvm/ADT/StringRef.h>
 #include <functional>
@@ -68,4 +68,4 @@ protected:
 } // namespace bolt
 } // namespace llvm
 
-#endif
+#endif // BOLT_RUNTIMELIBS_RUNTIME_LIBRARY_H
diff --git a/bolt/include/bolt/Utils/CommandLineOpts.h b/bolt/include/bolt/Utils/CommandLineOpts.h
index 33429e26bc02..0eb085de8230 100644
--- a/bolt/include/bolt/Utils/CommandLineOpts.h
+++ b/bolt/include/bolt/Utils/CommandLineOpts.h
@@ -9,8 +9,8 @@
 // BOLT CLI options
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_TOOLS_LLVM_BOLT_COMMAND_LINE_OPTS_H
-#define LLVM_TOOLS_LLVM_BOLT_COMMAND_LINE_OPTS_H
+#ifndef BOLT_UTILS_COMMAND_LINE_OPTS_H
+#define BOLT_UTILS_COMMAND_LINE_OPTS_H
 
 #include "llvm/Support/CommandLine.h"
 
diff --git a/bolt/include/bolt/Utils/NameResolver.h b/bolt/include/bolt/Utils/NameResolver.h
index 9392308f1e2b..f2da1d38eaea 100644
--- a/bolt/include/bolt/Utils/NameResolver.h
+++ b/bolt/include/bolt/Utils/NameResolver.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_NAME_RESOLVER_H
-#define LLVM_TOOLS_LLVM_BOLT_NAME_RESOLVER_H
+#ifndef BOLT_UTILS_NAME_RESOLVER_H
+#define BOLT_UTILS_NAME_RESOLVER_H
 
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/Twine.h"
diff --git a/bolt/include/bolt/Utils/NameShortener.h b/bolt/include/bolt/Utils/NameShortener.h
index fb59f697ae54..95bf7e1f1ad1 100644
--- a/bolt/include/bolt/Utils/NameShortener.h
+++ b/bolt/include/bolt/Utils/NameShortener.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_NAME_SHORTENER_H
-#define LLVM_TOOLS_LLVM_BOLT_NAME_SHORTENER_H
+#ifndef BOLT_UTILS_NAME_SHORTENER_H
+#define BOLT_UTILS_NAME_SHORTENER_H
 
 #include "llvm/ADT/StringMap.h"
 #include "llvm/ADT/Twine.h"
diff --git a/bolt/include/bolt/Utils/Utils.h b/bolt/include/bolt/Utils/Utils.h
index d8fd6e7e308a..372cc754cf01 100644
--- a/bolt/include/bolt/Utils/Utils.h
+++ b/bolt/include/bolt/Utils/Utils.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_TOOLS_LLVM_BOLT_UTILS_H
-#define LLVM_TOOLS_LLVM_BOLT_UTILS_H
+#ifndef BOLT_UTILS_UTILS_H
+#define BOLT_UTILS_UTILS_H
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/Twine.h"