diff --git a/llvm/include/llvm/XRay/FDRRecordProducer.h b/llvm/include/llvm/XRay/FDRRecordProducer.h
@@ -5,8 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_INCLUDE_LLVM_XRAY_FDRRECORDPRODUCER_H_
-#define LLVM_INCLUDE_LLVM_XRAY_FDRRECORDPRODUCER_H_
+#ifndef LLVM_XRAY_FDRRECORDPRODUCER_H
+#define LLVM_XRAY_FDRRECORDPRODUCER_H
 
 #include "llvm/Support/Error.h"
 #include "llvm/XRay/FDRRecords.h"
@@ -47,4 +47,4 @@ class FileBasedRecordProducer : public RecordProducer {
 } // namespace xray
 } // namespace llvm
 
-#endif // LLVM_INCLUDE_LLVM_XRAY_FDRRECORDPRODUCER_H_
+#endif // LLVM_XRAY_FDRRECORDPRODUCER_H
diff --git a/llvm/include/llvm/XRay/FDRRecords.h b/llvm/include/llvm/XRay/FDRRecords.h
@@ -10,8 +10,8 @@
 // of records we encounter in XRay flight data recorder mode traces.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_XRAY_FDRRECORDS_H_
-#define LLVM_LIB_XRAY_FDRRECORDS_H_
+#ifndef LLVM_XRAY_FDRRECORDS_H
+#define LLVM_XRAY_FDRRECORDS_H
 
 #include <cstdint>
 #include <string>
@@ -446,4 +446,4 @@ class RecordInitializer : public RecordVisitor {
 } // namespace xray
 } // namespace llvm
 
-#endif // LLVM_LIB_XRAY_FDRRECORDS_H_
+#endif // LLVM_XRAY_FDRRECORDS_H
diff --git a/llvm/include/llvm/XRay/FDRTraceExpander.h b/llvm/include/llvm/XRay/FDRTraceExpander.h
@@ -10,8 +10,8 @@
 // from a sequence of FDR mode records in arrival order into a collection.
 //
 //===----------------------------------------------------------------------===//
-#ifndef INCLUDE_LLVM_XRAY_FDRTRACEEXPANDER_H_
-#define INCLUDE_LLVM_XRAY_FDRTRACEEXPANDER_H_
+#ifndef LLVM_XRAY_FDRTRACEEXPANDER_H
+#define LLVM_XRAY_FDRTRACEEXPANDER_H
 
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/XRay/FDRRecords.h"
@@ -59,4 +59,4 @@ class TraceExpander : public RecordVisitor {
 } // namespace xray
 } // namespace llvm
 
-#endif // INCLUDE_LLVM_XRAY_FDRTRACEEXPANDER_H_
+#endif // LLVM_XRAY_FDRTRACEEXPANDER_H
diff --git a/llvm/include/llvm/XRay/FDRTraceWriter.h b/llvm/include/llvm/XRay/FDRTraceWriter.h
@@ -9,8 +9,8 @@
 // Test a utility that can write out XRay FDR Mode formatted trace files.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_INCLUDE_LLVM_XRAY_FDRTRACEWRITER_H_
-#define LLVM_INCLUDE_LLVM_XRAY_FDRTRACEWRITER_H_
+#ifndef LLVM_XRAY_FDRTRACEWRITER_H
+#define LLVM_XRAY_FDRTRACEWRITER_H
 
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/EndianStream.h"
@@ -52,4 +52,4 @@ class FDRTraceWriter : public RecordVisitor {
 } // namespace xray
 } // namespace llvm
 
-#endif // LLVM_INCLUDE_LLVM_XRAY_FDRTRACEWRITER_H_
+#endif // LLVM_XRAY_FDRTRACEWRITER_H
diff --git a/llvm/include/llvm/XRay/FileHeaderReader.h b/llvm/include/llvm/XRay/FileHeaderReader.h
@@ -10,8 +10,8 @@
 // sources.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_LIB_XRAY_FILEHEADERREADER_H_
-#define LLVM_LIB_XRAY_FILEHEADERREADER_H_
+#ifndef LLVM_XRAY_FILEHEADERREADER_H
+#define LLVM_XRAY_FILEHEADERREADER_H
 
 #include "llvm/Support/DataExtractor.h"
 #include "llvm/Support/Error.h"
@@ -29,4 +29,4 @@ Expected<XRayFileHeader> readBinaryFormatHeader(DataExtractor &HeaderExtractor,
 } // namespace xray
 } // namespace llvm
 
-#endif // LLVM_LIB_XRAY_FILEHEADERREADER_H_
+#endif // LLVM_XRAY_FILEHEADERREADER_H
diff --git a/llvm/include/llvm/XRay/Graph.h b/llvm/include/llvm/XRay/Graph.h
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_XRAY_GRAPH_T_H
-#define LLVM_XRAY_GRAPH_T_H
+#ifndef LLVM_XRAY_GRAPH_H
+#define LLVM_XRAY_GRAPH_H
 
 #include <initializer_list>
 #include <stdint.h>

diff --git a/llvm/include/llvm/XRay/InstrumentationMap.h b/llvm/include/llvm/XRay/InstrumentationMap.h
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_XRAY_INSTRUMENTATION_MAP_H
-#define LLVM_XRAY_INSTRUMENTATION_MAP_H
+#ifndef LLVM_XRAY_INSTRUMENTATIONMAP_H
+#define LLVM_XRAY_INSTRUMENTATIONMAP_H
 
 #include "llvm/ADT/Optional.h"
 #include "llvm/ADT/StringRef.h"
@@ -135,4 +135,4 @@ template <> struct MappingTraits<xray::YAMLXRaySledEntry> {
 
 LLVM_YAML_IS_SEQUENCE_VECTOR(xray::YAMLXRaySledEntry)
 
-#endif // LLVM_XRAY_INSTRUMENTATION_MAP_H
+#endif // LLVM_XRAY_INSTRUMENTATIONMAP_H
diff --git a/llvm/include/llvm/XRay/RecordPrinter.h b/llvm/include/llvm/XRay/RecordPrinter.h
@@ -10,8 +10,8 @@
 // data in an adhoc format, suitable for human inspection.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_INCLUDE_LLVM_XRAY_RECORDPRINTER_H_
-#define LLVM_INCLUDE_LLVM_XRAY_RECORDPRINTER_H_
+#ifndef LLVM_XRAY_RECORDPRINTER_H
+#define LLVM_XRAY_RECORDPRINTER_H
 
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/XRay/FDRRecords.h"
@@ -46,4 +46,4 @@ class RecordPrinter : public RecordVisitor {
 } // namespace xray
 } // namespace llvm
 
-#endif // LLVM_INCLUDE_LLVM_XRAY_RECORDPRINTER_H
+#endif // LLVM_XRAY_RECORDPRINTER_H
diff --git a/llvm/include/llvm/XRay/XRayRecord.h b/llvm/include/llvm/XRay/XRayRecord.h
@@ -11,8 +11,8 @@
 // xray project.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_XRAY_XRAY_RECORD_H
-#define LLVM_XRAY_XRAY_RECORD_H
+#ifndef LLVM_XRAY_XRAYRECORD_H
+#define LLVM_XRAY_XRAYRECORD_H
 
 #include <cstdint>
 #include <vector>
@@ -101,4 +101,4 @@ struct XRayRecord {
 } // namespace xray
 } // namespace llvm
 
-#endif // LLVM_XRAY_XRAY_RECORD_H
+#endif // LLVM_XRAY_XRAYRECORD_H
diff --git a/llvm/include/llvm/XRay/YAMLXRayRecord.h b/llvm/include/llvm/XRay/YAMLXRayRecord.h
@@ -9,8 +9,8 @@
 // Types and traits specialisations for YAML I/O of XRay log entries.
 //
 //===----------------------------------------------------------------------===//
-#ifndef LLVM_XRAY_YAML_XRAY_RECORD_H
-#define LLVM_XRAY_YAML_XRAY_RECORD_H
+#ifndef LLVM_XRAY_YAMLXRAYRECORD_H
+#define LLVM_XRAY_YAMLXRAYRECORD_H
 
 #include <type_traits>
 
@@ -104,4 +104,4 @@ template <> struct MappingTraits<xray::YAMLXRayTrace> {
 
 LLVM_YAML_IS_SEQUENCE_VECTOR(xray::YAMLXRayRecord)
 
-#endif // LLVM_XRAY_YAML_XRAY_RECORD_H
+#endif // LLVM_XRAY_YAMLXRAYRECORD_H