https://github.com/JDevlieghere created 
https://github.com/llvm/llvm-project/pull/181312

Fix LLDB header guards, using clang-tidy's llvm-header-guard check. A bunch of 
headers have been moved or renamed, and we often forget to update the header 
guard.

>From c60838a92ff79b3cada2596951b4dfc27e4a267c Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <[email protected]>
Date: Thu, 12 Feb 2026 21:57:40 -0800
Subject: [PATCH] [lldb] Fix LLDB header guards (NFC)

Fix LLDB header guards, using clang-tidy's llvm-header-guard check. A
bunch of headers have been moved or renamed, and we often forget to
update the header guard.
---
 lldb/include/lldb/API/SBProcessInfoList.h                  | 6 +++---
 lldb/include/lldb/Breakpoint/StoppointHitCounter.h         | 6 +++---
 lldb/include/lldb/Core/AddressRangeListImpl.h              | 2 +-
 lldb/include/lldb/Core/DebuggerEvents.h                    | 5 +++++
 lldb/include/lldb/Core/Declaration.h                       | 6 +++---
 lldb/include/lldb/Core/SourceLocationSpec.h                | 6 +++---
 lldb/include/lldb/Host/common/DiagnosticsRendering.h       | 4 ++--
 lldb/include/lldb/Host/common/ZipFileResolver.h            | 6 +++---
 lldb/include/lldb/Host/posix/Support.h                     | 2 +-
 .../Interpreter/Interfaces/ScriptedBreakpointInterface.h   | 2 +-
 .../lldb/Interpreter/Interfaces/ScriptedInterfaceUsages.h  | 6 +++---
 lldb/include/lldb/Symbol/SaveCoreOptions.h                 | 6 +++---
 lldb/include/lldb/Symbol/SymbolLocator.h                   | 2 +-
 lldb/include/lldb/Target/RegisterTypeBuilder.h             | 6 +++---
 lldb/include/lldb/Target/TraceCursor.h                     | 6 +++---
 lldb/include/lldb/Target/TraceDumper.h                     | 5 +++++
 lldb/include/lldb/Target/TraceExporter.h                   | 6 +++---
 lldb/include/lldb/Utility/AppleUuidCompatibility.h         | 6 +++---
 lldb/include/lldb/Utility/ErrorMessages.h                  | 4 ++--
 lldb/include/lldb/Utility/FileSpecList.h                   | 6 +++---
 lldb/include/lldb/Utility/ScriptedMetadata.h               | 6 +++---
 lldb/include/lldb/Utility/StreamBuffer.h                   | 6 +++---
 lldb/include/lldb/Utility/XcodeSDK.h                       | 4 ++--
 lldb/include/lldb/ValueObject/ValueObjectSynthetic.h       | 6 +++---
 lldb/source/Commands/CommandObjectProtocolServer.h         | 2 +-
 lldb/source/Commands/CommandObjectRegexCommand.h           | 6 +++---
 lldb/source/Commands/CommandObjectScripting.h              | 6 +++---
 lldb/source/Host/macosx/objcxx/PosixSpawnResponsible.h     | 6 +++---
 lldb/source/Plugins/ABI/RISCV/ABISysV_riscv.h              | 6 +++---
 .../DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h        | 6 +++---
 .../Plugins/ExpressionParser/Clang/ClangExpressionUtil.h   | 2 +-
 .../Plugins/ExpressionParser/Clang/NameSearchContext.h     | 6 +++---
 lldb/source/Plugins/Highlighter/Clang/ClangHighlighter.h   | 4 ++--
 .../Plugins/Highlighter/Default/DefaultHighlighter.h       | 4 ++--
 lldb/source/Plugins/Instruction/RISCV/RISCVCInstructions.h | 6 +++---
 lldb/source/Plugins/Instruction/RISCV/RISCVInstructions.h  | 6 +++---
 .../BoundsSafety/InstrumentationRuntimeBoundsSafety.h      | 4 ++--
 .../InstrumentationRuntime/Utility/ReportRetriever.h       | 5 +++++
 .../LanguageRuntime/CPlusPlus/VerboseTrapFrameRecognizer.h | 6 +++---
 .../Mach-O-Fileset/ObjectContainerMachOFileset.h           | 6 +++---
 lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.h     | 2 +-
 .../Plugins/OperatingSystem/Python/OperatingSystemPython.h | 6 +++---
 lldb/source/Plugins/Platform/WebAssembly/PlatformWasm.h    | 6 +++---
 .../Platform/WebAssembly/PlatformWasmRemoteGDBServer.h     | 6 +++---
 .../Process/Utility/NativeProcessSoftwareSingleStep.h      | 6 +++---
 .../Plugins/Process/Utility/NativeRegisterContextDBReg.h   | 6 +++---
 .../Process/Utility/NativeRegisterContextDBReg_arm.h       | 6 +++---
 .../Process/Utility/NativeRegisterContextDBReg_arm64.h     | 6 +++---
 .../Process/Utility/NativeRegisterContextDBReg_loongarch.h | 6 +++---
 .../Process/Utility/NativeRegisterContextDBReg_x86.h       | 6 +++---
 .../Plugins/Process/Utility/RegisterInfoPOSIX_ppc64.h      | 2 +-
 lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h    | 5 +++++
 lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h  | 5 +++++
 .../Plugins/Process/Utility/RegisterInfos_arm64_sve.h      | 5 +++++
 lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h   | 5 +++++
 .../Plugins/Process/Utility/RegisterInfos_loongarch64.h    | 5 +++++
 .../source/Plugins/Process/Utility/RegisterInfos_powerpc.h | 5 +++++
 lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h  | 5 +++++
 .../source/Plugins/Process/Utility/RegisterInfos_ppc64le.h | 5 +++++
 .../source/Plugins/Process/Utility/RegisterInfos_riscv32.h | 5 +++++
 .../source/Plugins/Process/Utility/RegisterInfos_riscv64.h | 5 +++++
 lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h  | 5 +++++
 lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h | 5 +++++
 .../Process/Utility/RegisterInfos_x86_64_with_base.h       | 5 +++++
 .../Utility/RegisterInfos_x86_64_with_base_shared.h        | 5 +++++
 .../Plugins/Process/mach-core/RegisterContextUnifiedCore.h | 6 +++---
 lldb/source/Plugins/Process/scripted/ScriptedFrame.h       | 6 +++---
 lldb/source/Plugins/Process/scripted/ScriptedProcess.h     | 6 +++---
 lldb/source/Plugins/Process/scripted/ScriptedThread.h      | 6 +++---
 lldb/source/Plugins/Protocol/MCP/ProtocolServerMCP.h       | 4 ++--
 lldb/source/Plugins/Protocol/MCP/Resource.h                | 4 ++--
 lldb/source/Plugins/Protocol/MCP/Tool.h                    | 4 ++--
 .../Plugins/RegisterTypeBuilder/RegisterTypeBuilderClang.h | 6 +++---
 lldb/source/Plugins/ScriptInterpreter/Lua/Lua.h            | 6 +++---
 lldb/source/Plugins/ScriptInterpreter/Lua/SWIGLuaBridge.h  | 6 +++---
 .../Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h   | 6 +++---
 .../Python/Interfaces/OperatingSystemPythonInterface.h     | 6 +++---
 .../Python/Interfaces/ScriptInterpreterPythonInterfaces.h  | 6 +++---
 .../Python/Interfaces/ScriptedBreakpointPythonInterface.h  | 6 +++---
 .../Interfaces/ScriptedFrameProviderPythonInterface.h      | 6 +++---
 .../Python/Interfaces/ScriptedFramePythonInterface.h       | 6 +++---
 .../Python/Interfaces/ScriptedPlatformPythonInterface.h    | 6 +++---
 .../Python/Interfaces/ScriptedProcessPythonInterface.h     | 6 +++---
 .../Python/Interfaces/ScriptedPythonInterface.h            | 6 +++---
 .../Python/Interfaces/ScriptedStopHookPythonInterface.h    | 6 +++---
 .../Python/Interfaces/ScriptedThreadPlanPythonInterface.h  | 6 +++---
 .../Python/Interfaces/ScriptedThreadPythonInterface.h      | 6 +++---
 .../Plugins/ScriptInterpreter/Python/PythonDataObjects.h   | 7 +++----
 .../Plugins/ScriptInterpreter/Python/PythonReadline.h      | 6 +++---
 .../Plugins/ScriptInterpreter/Python/SWIGPythonBridge.h    | 6 +++---
 .../ScriptInterpreter/Python/ScriptInterpreterPython.h     | 6 +++---
 .../ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h | 6 +++---
 lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h | 6 +++---
 .../ScriptedFrameProvider/ScriptedFrameProvider.h          | 6 +++---
 .../SystemRuntime/MacOSX/AbortWithPayloadFrameRecognizer.h | 6 +++---
 lldb/source/Plugins/Trace/common/ThreadPostMortemTrace.h   | 6 +++---
 lldb/source/Plugins/TraceExporter/common/TraceHTR.h        | 6 +++---
 .../TraceExporter/ctf/CommandObjectThreadTraceExportCTF.h  | 6 +++---
 lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.h   | 6 +++---
 lldb/source/Utility/WasmVirtualRegisters.h                 | 4 ++--
 100 files changed, 308 insertions(+), 224 deletions(-)

diff --git a/lldb/include/lldb/API/SBProcessInfoList.h 
b/lldb/include/lldb/API/SBProcessInfoList.h
index 9d3f65c46fbbe..79248d690e05b 100644
--- a/lldb/include/lldb/API/SBProcessInfoList.h
+++ b/lldb/include/lldb/API/SBProcessInfoList.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_API_SBPROCESSINSTANCEINFOLIST_H
-#define LLDB_API_SBPROCESSINSTANCEINFOLIST_H
+#ifndef LLDB_API_SBPROCESSINFOLIST_H
+#define LLDB_API_SBPROCESSINFOLIST_H
 
 #include "lldb/API/SBDefines.h"
 
@@ -43,4 +43,4 @@ class LLDB_API SBProcessInfoList {
 
 } // namespace lldb
 
-#endif // LLDB_API_SBPROCESSINSTANCEINFOLIST_H
+#endif // LLDB_API_SBPROCESSINFOLIST_H
diff --git a/lldb/include/lldb/Breakpoint/StoppointHitCounter.h 
b/lldb/include/lldb/Breakpoint/StoppointHitCounter.h
index ae9ec6b3c807b..af4398d6e3e2f 100644
--- a/lldb/include/lldb/Breakpoint/StoppointHitCounter.h
+++ b/lldb/include/lldb/Breakpoint/StoppointHitCounter.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_BREAKPOINT_STOPPOINT_HIT_COUNTER_H
-#define LLDB_BREAKPOINT_STOPPOINT_HIT_COUNTER_H
+#ifndef LLDB_BREAKPOINT_STOPPOINTHITCOUNTER_H
+#define LLDB_BREAKPOINT_STOPPOINTHITCOUNTER_H
 
 #include <cassert>
 #include <cstdint>
@@ -40,4 +40,4 @@ class StoppointHitCounter {
 
 } // namespace lldb_private
 
-#endif // LLDB_BREAKPOINT_STOPPOINT_HIT_COUNTER_H
+#endif // LLDB_BREAKPOINT_STOPPOINTHITCOUNTER_H
diff --git a/lldb/include/lldb/Core/AddressRangeListImpl.h 
b/lldb/include/lldb/Core/AddressRangeListImpl.h
index 6b88f9b1ac179..2fe9f022af37d 100644
--- a/lldb/include/lldb/Core/AddressRangeListImpl.h
+++ b/lldb/include/lldb/Core/AddressRangeListImpl.h
@@ -51,4 +51,4 @@ class AddressRangeListImpl {
 
 } // namespace lldb_private
 
-#endif // LLDB_CORE_ADDRESSRANGE_H
+#endif // LLDB_CORE_ADDRESSRANGELISTIMPL_H
diff --git a/lldb/include/lldb/Core/DebuggerEvents.h 
b/lldb/include/lldb/Core/DebuggerEvents.h
index 49a4ecf8e537e..090e48327b3ff 100644
--- a/lldb/include/lldb/Core/DebuggerEvents.h
+++ b/lldb/include/lldb/Core/DebuggerEvents.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_CORE_DEBUGGEREVENTS_H
+#define LLDB_CORE_DEBUGGEREVENTS_H
+
 //===-- DebuggerEvents.h ----------------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -133,3 +136,5 @@ class SymbolChangeEventData : public EventData {
 } // namespace lldb_private
 
 #endif // LLDB_CORE_DEBUGGER_EVENTS_H
+
+#endif
diff --git a/lldb/include/lldb/Core/Declaration.h 
b/lldb/include/lldb/Core/Declaration.h
index c864b88c6b32a..adfe0da9cc7c8 100644
--- a/lldb/include/lldb/Core/Declaration.h
+++ b/lldb/include/lldb/Core/Declaration.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SYMBOL_DECLARATION_H
-#define LLDB_SYMBOL_DECLARATION_H
+#ifndef LLDB_CORE_DECLARATION_H
+#define LLDB_CORE_DECLARATION_H
 
 #include "lldb/Utility/FileSpec.h"
 #include "lldb/lldb-private.h"
@@ -194,4 +194,4 @@ bool operator==(const Declaration &lhs, const Declaration 
&rhs);
 
 } // namespace lldb_private
 
-#endif // LLDB_SYMBOL_DECLARATION_H
+#endif // LLDB_CORE_DECLARATION_H
diff --git a/lldb/include/lldb/Core/SourceLocationSpec.h 
b/lldb/include/lldb/Core/SourceLocationSpec.h
index 9c2512bff4b7f..4df1032fdd177 100644
--- a/lldb/include/lldb/Core/SourceLocationSpec.h
+++ b/lldb/include/lldb/Core/SourceLocationSpec.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_UTILITY_SOURCELOCATIONSPEC_H
-#define LLDB_UTILITY_SOURCELOCATIONSPEC_H
+#ifndef LLDB_CORE_SOURCELOCATIONSPEC_H
+#define LLDB_CORE_SOURCELOCATIONSPEC_H
 
 #include "lldb/Core/Declaration.h"
 #include "lldb/lldb-defines.h"
@@ -185,4 +185,4 @@ class SourceLocationSpec {
 Stream &operator<<(Stream &s, const SourceLocationSpec &loc);
 } // namespace lldb_private
 
-#endif // LLDB_UTILITY_SOURCELOCATIONSPEC_H
+#endif // LLDB_CORE_SOURCELOCATIONSPEC_H
diff --git a/lldb/include/lldb/Host/common/DiagnosticsRendering.h 
b/lldb/include/lldb/Host/common/DiagnosticsRendering.h
index 3eea0647da37e..5a63dc942b88c 100644
--- a/lldb/include/lldb/Host/common/DiagnosticsRendering.h
+++ b/lldb/include/lldb/Host/common/DiagnosticsRendering.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_UTILITY_DIAGNOSTICSRENDERING_H
-#define LLDB_UTILITY_DIAGNOSTICSRENDERING_H
+#ifndef LLDB_HOST_COMMON_DIAGNOSTICSRENDERING_H
+#define LLDB_HOST_COMMON_DIAGNOSTICSRENDERING_H
 
 #include "lldb/Utility/Status.h"
 #include "lldb/Utility/Stream.h"
diff --git a/lldb/include/lldb/Host/common/ZipFileResolver.h 
b/lldb/include/lldb/Host/common/ZipFileResolver.h
index ec7151f3e57c9..ac0576fee8e77 100644
--- a/lldb/include/lldb/Host/common/ZipFileResolver.h
+++ b/lldb/include/lldb/Host/common/ZipFileResolver.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_HOST_ZIPFILERESOLVER_H
-#define LLDB_HOST_ZIPFILERESOLVER_H
+#ifndef LLDB_HOST_COMMON_ZIPFILERESOLVER_H
+#define LLDB_HOST_COMMON_ZIPFILERESOLVER_H
 
 #include "lldb/lldb-private.h"
 
@@ -37,4 +37,4 @@ class ZipFileResolver {
 
 } // end of namespace lldb_private
 
-#endif // LLDB_HOST_ZIPFILERESOLVER_H
+#endif // LLDB_HOST_COMMON_ZIPFILERESOLVER_H
diff --git a/lldb/include/lldb/Host/posix/Support.h 
b/lldb/include/lldb/Host/posix/Support.h
index 4e779b6485ff4..cbe09c9ae0a1f 100644
--- a/lldb/include/lldb/Host/posix/Support.h
+++ b/lldb/include/lldb/Host/posix/Support.h
@@ -24,4 +24,4 @@ getProcFile(const llvm::Twine &file);
 
 } // namespace lldb_private
 
-#endif // #ifndef LLDB_HOST_POSIX_SUPPORT_H
+#endif // LLDB_HOST_POSIX_SUPPORT_H
diff --git 
a/lldb/include/lldb/Interpreter/Interfaces/ScriptedBreakpointInterface.h 
b/lldb/include/lldb/Interpreter/Interfaces/ScriptedBreakpointInterface.h
index d29fd8126e0cc..d6d2ee786788e 100644
--- a/lldb/include/lldb/Interpreter/Interfaces/ScriptedBreakpointInterface.h
+++ b/lldb/include/lldb/Interpreter/Interfaces/ScriptedBreakpointInterface.h
@@ -39,4 +39,4 @@ class ScriptedBreakpointInterface : public ScriptedInterface {
 };
 } // namespace lldb_private
 
-#endif // LLDB_INTERPRETER_INTERFACES_SCRIPTEDSTOPHOOKINTERFACE_H
+#endif // LLDB_INTERPRETER_INTERFACES_SCRIPTEDBREAKPOINTINTERFACE_H
diff --git a/lldb/include/lldb/Interpreter/Interfaces/ScriptedInterfaceUsages.h 
b/lldb/include/lldb/Interpreter/Interfaces/ScriptedInterfaceUsages.h
index 36c0cfdca546e..d958e782d86bd 100644
--- a/lldb/include/lldb/Interpreter/Interfaces/ScriptedInterfaceUsages.h
+++ b/lldb/include/lldb/Interpreter/Interfaces/ScriptedInterfaceUsages.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_INTERPRETER_SCRIPTEDINTERFACEUSAGES_H
-#define LLDB_INTERPRETER_SCRIPTEDINTERFACEUSAGES_H
+#ifndef LLDB_INTERPRETER_INTERFACES_SCRIPTEDINTERFACEUSAGES_H
+#define LLDB_INTERPRETER_INTERFACES_SCRIPTEDINTERFACEUSAGES_H
 
 #include "lldb/lldb-types.h"
 
@@ -40,4 +40,4 @@ class ScriptedInterfaceUsages {
 };
 } // namespace lldb_private
 
-#endif // LLDB_INTERPRETER_SCRIPTEDINTERFACEUSAGES_H
+#endif // LLDB_INTERPRETER_INTERFACES_SCRIPTEDINTERFACEUSAGES_H
diff --git a/lldb/include/lldb/Symbol/SaveCoreOptions.h 
b/lldb/include/lldb/Symbol/SaveCoreOptions.h
index 5be7b8c45efd5..7ed228df0135e 100644
--- a/lldb/include/lldb/Symbol/SaveCoreOptions.h
+++ b/lldb/include/lldb/Symbol/SaveCoreOptions.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_OBJECTFILE_SaveCoreOPTIONS_H
-#define LLDB_SOURCE_PLUGINS_OBJECTFILE_SaveCoreOPTIONS_H
+#ifndef LLDB_SYMBOL_SAVECOREOPTIONS_H
+#define LLDB_SYMBOL_SAVECOREOPTIONS_H
 
 #include "lldb/Target/CoreFileMemoryRanges.h"
 #include "lldb/Target/ThreadCollection.h"
@@ -68,4 +68,4 @@ class SaveCoreOptions {
 };
 } // namespace lldb_private
 
-#endif // LLDB_SOURCE_PLUGINS_OBJECTFILE_SAVECOREOPTIONS_H
+#endif // LLDB_SYMBOL_SAVECOREOPTIONS_H
diff --git a/lldb/include/lldb/Symbol/SymbolLocator.h 
b/lldb/include/lldb/Symbol/SymbolLocator.h
index 8d2f26b3d0cca..400b4adfd73c4 100644
--- a/lldb/include/lldb/Symbol/SymbolLocator.h
+++ b/lldb/include/lldb/Symbol/SymbolLocator.h
@@ -28,4 +28,4 @@ class SymbolLocator : public PluginInterface {
 
 } // namespace lldb_private
 
-#endif // LLDB_SYMBOL_SYMBOLFILELOCATOR_H
+#endif // LLDB_SYMBOL_SYMBOLLOCATOR_H
diff --git a/lldb/include/lldb/Target/RegisterTypeBuilder.h 
b/lldb/include/lldb/Target/RegisterTypeBuilder.h
index f7b5814895adc..7239e1d4bd126 100644
--- a/lldb/include/lldb/Target/RegisterTypeBuilder.h
+++ b/lldb/include/lldb/Target/RegisterTypeBuilder.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_TARGET_REGISTER_TYPE_BUILDER_H
-#define LLDB_TARGET_REGISTER_TYPE_BUILDER_H
+#ifndef LLDB_TARGET_REGISTERTYPEBUILDER_H
+#define LLDB_TARGET_REGISTERTYPEBUILDER_H
 
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/lldb-private.h"
@@ -32,4 +32,4 @@ class RegisterTypeBuilder : public PluginInterface {
 
 } // namespace lldb_private
 
-#endif // LLDB_TARGET_REGISTER_TYPE_BUILDER_H
+#endif // LLDB_TARGET_REGISTERTYPEBUILDER_H
diff --git a/lldb/include/lldb/Target/TraceCursor.h 
b/lldb/include/lldb/Target/TraceCursor.h
index f5546d8284d37..964f3ffff76d1 100644
--- a/lldb/include/lldb/Target/TraceCursor.h
+++ b/lldb/include/lldb/Target/TraceCursor.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_TARGET_TRACE_CURSOR_H
-#define LLDB_TARGET_TRACE_CURSOR_H
+#ifndef LLDB_TARGET_TRACECURSOR_H
+#define LLDB_TARGET_TRACECURSOR_H
 
 #include "lldb/lldb-private.h"
 
@@ -290,4 +290,4 @@ class TraceCursor {
 };
 } // namespace lldb_private
 
-#endif // LLDB_TARGET_TRACE_CURSOR_H
+#endif // LLDB_TARGET_TRACECURSOR_H
diff --git a/lldb/include/lldb/Target/TraceDumper.h 
b/lldb/include/lldb/Target/TraceDumper.h
index d3cea4b28449e..f5ccebf930748 100644
--- a/lldb/include/lldb/Target/TraceDumper.h
+++ b/lldb/include/lldb/Target/TraceDumper.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_TARGET_TRACEDUMPER_H
+#define LLDB_TARGET_TRACEDUMPER_H
+
 //===-- TraceDumper.h -------------------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -432,3 +435,5 @@ class TraceDumper {
 } // namespace lldb_private
 
 #endif // LLDB_TARGET_TRACE_INSTRUCTION_DUMPER_H
+
+#endif
diff --git a/lldb/include/lldb/Target/TraceExporter.h 
b/lldb/include/lldb/Target/TraceExporter.h
index d5a06c499a6e2..52ebbd9ccafeb 100644
--- a/lldb/include/lldb/Target/TraceExporter.h
+++ b/lldb/include/lldb/Target/TraceExporter.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_TARGET_TRACE_EXPORTER_H
-#define LLDB_TARGET_TRACE_EXPORTER_H
+#ifndef LLDB_TARGET_TRACEEXPORTER_H
+#define LLDB_TARGET_TRACEEXPORTER_H
 
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/lldb-forward.h"
@@ -41,4 +41,4 @@ class TraceExporter : public PluginInterface {
 
 } // namespace lldb_private
 
-#endif // LLDB_TARGET_TRACE_EXPORTER_H
+#endif // LLDB_TARGET_TRACEEXPORTER_H
diff --git a/lldb/include/lldb/Utility/AppleUuidCompatibility.h 
b/lldb/include/lldb/Utility/AppleUuidCompatibility.h
index 88913a68ece8d..bb60d2f2edd3e 100644
--- a/lldb/include/lldb/Utility/AppleUuidCompatibility.h
+++ b/lldb/include/lldb/Utility/AppleUuidCompatibility.h
@@ -9,8 +9,8 @@
 // Include this header for a definition of uuid_t compatible with Darwin's
 // definition.
 
-#ifndef utility_UUID_COMPATIBILITY_H
-#define utility_UUID_COMPATIBILITY_H
+#ifndef LLDB_UTILITY_APPLEUUIDCOMPATIBILITY_H
+#define LLDB_UTILITY_APPLEUUIDCOMPATIBILITY_H
 // uuid_t is guaranteed to always be a 16-byte array
 typedef unsigned char uuid_t[16];
-#endif // utility_UUID_COMPATIBILITY_H
+#endif // LLDB_UTILITY_APPLEUUIDCOMPATIBILITY_H
diff --git a/lldb/include/lldb/Utility/ErrorMessages.h 
b/lldb/include/lldb/Utility/ErrorMessages.h
index 116e29e0e6187..3476cf29f0993 100644
--- a/lldb/include/lldb/Utility/ErrorMessages.h
+++ b/lldb/include/lldb/Utility/ErrorMessages.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_UTILITY_ERROR_MESSAGES_H
-#define LLDB_UTILITY_ERROR_MESSAGES_H
+#ifndef LLDB_UTILITY_ERRORMESSAGES_H
+#define LLDB_UTILITY_ERRORMESSAGES_H
 
 #include "lldb/lldb-defines.h"
 #include "lldb/lldb-enumerations.h"
diff --git a/lldb/include/lldb/Utility/FileSpecList.h 
b/lldb/include/lldb/Utility/FileSpecList.h
index b565c2ab7f762..69c5b49841a12 100644
--- a/lldb/include/lldb/Utility/FileSpecList.h
+++ b/lldb/include/lldb/Utility/FileSpecList.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_CORE_FILESPECLIST_H
-#define LLDB_CORE_FILESPECLIST_H
+#ifndef LLDB_UTILITY_FILESPECLIST_H
+#define LLDB_UTILITY_FILESPECLIST_H
 
 #include "lldb/Utility/FileSpec.h"
 #include "lldb/Utility/SupportFile.h"
@@ -254,4 +254,4 @@ class FileSpecList {
 
 } // namespace lldb_private
 
-#endif // LLDB_CORE_FILESPECLIST_H
+#endif // LLDB_UTILITY_FILESPECLIST_H
diff --git a/lldb/include/lldb/Utility/ScriptedMetadata.h 
b/lldb/include/lldb/Utility/ScriptedMetadata.h
index 8523c95429718..ba9462e65151e 100644
--- a/lldb/include/lldb/Utility/ScriptedMetadata.h
+++ b/lldb/include/lldb/Utility/ScriptedMetadata.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_INTERPRETER_SCRIPTEDMETADATA_H
-#define LLDB_INTERPRETER_SCRIPTEDMETADATA_H
+#ifndef LLDB_UTILITY_SCRIPTEDMETADATA_H
+#define LLDB_UTILITY_SCRIPTEDMETADATA_H
 
 #include "lldb/Utility/ProcessInfo.h"
 #include "lldb/Utility/StreamString.h"
@@ -65,4 +65,4 @@ class ScriptedMetadata {
 };
 } // namespace lldb_private
 
-#endif // LLDB_INTERPRETER_SCRIPTEDMETADATA_H
+#endif // LLDB_UTILITY_SCRIPTEDMETADATA_H
diff --git a/lldb/include/lldb/Utility/StreamBuffer.h 
b/lldb/include/lldb/Utility/StreamBuffer.h
index 2e61a214302bb..d6edfff0129ca 100644
--- a/lldb/include/lldb/Utility/StreamBuffer.h
+++ b/lldb/include/lldb/Utility/StreamBuffer.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_CORE_STREAMBUFFER_H
-#define LLDB_CORE_STREAMBUFFER_H
+#ifndef LLDB_UTILITY_STREAMBUFFER_H
+#define LLDB_UTILITY_STREAMBUFFER_H
 
 #include "lldb/Utility/Stream.h"
 #include "llvm/ADT/SmallVector.h"
@@ -51,4 +51,4 @@ template <unsigned N> class StreamBuffer : public Stream {
 
 } // namespace lldb_private
 
-#endif // LLDB_CORE_STREAMBUFFER_H
+#endif // LLDB_UTILITY_STREAMBUFFER_H
diff --git a/lldb/include/lldb/Utility/XcodeSDK.h 
b/lldb/include/lldb/Utility/XcodeSDK.h
index 5f89019537689..a9cb997fec1e4 100644
--- a/lldb/include/lldb/Utility/XcodeSDK.h
+++ b/lldb/include/lldb/Utility/XcodeSDK.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_UTILITY_SDK_H
-#define LLDB_UTILITY_SDK_H
+#ifndef LLDB_UTILITY_XCODESDK_H
+#define LLDB_UTILITY_XCODESDK_H
 
 #include "lldb/Utility/FileSpec.h"
 #include "lldb/lldb-forward.h"
diff --git a/lldb/include/lldb/ValueObject/ValueObjectSynthetic.h 
b/lldb/include/lldb/ValueObject/ValueObjectSynthetic.h
index 1a82fd78bbba3..60803697ee020 100644
--- a/lldb/include/lldb/ValueObject/ValueObjectSynthetic.h
+++ b/lldb/include/lldb/ValueObject/ValueObjectSynthetic.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_VALUEOBJECT_VALUEOBJECTSYNTHETICFILTER_H
-#define LLDB_VALUEOBJECT_VALUEOBJECTSYNTHETICFILTER_H
+#ifndef LLDB_VALUEOBJECT_VALUEOBJECTSYNTHETIC_H
+#define LLDB_VALUEOBJECT_VALUEOBJECTSYNTHETIC_H
 
 #include "lldb/Symbol/CompilerType.h"
 #include "lldb/Utility/ConstString.h"
@@ -181,4 +181,4 @@ class ValueObjectSynthetic : public ValueObject {
 
 } // namespace lldb_private
 
-#endif // LLDB_VALUEOBJECT_VALUEOBJECTSYNTHETICFILTER_H
+#endif // LLDB_VALUEOBJECT_VALUEOBJECTSYNTHETIC_H
diff --git a/lldb/source/Commands/CommandObjectProtocolServer.h 
b/lldb/source/Commands/CommandObjectProtocolServer.h
index 791b3a78aaf02..c1dbf46f331a4 100644
--- a/lldb/source/Commands/CommandObjectProtocolServer.h
+++ b/lldb/source/Commands/CommandObjectProtocolServer.h
@@ -21,4 +21,4 @@ class CommandObjectProtocolServer : public 
CommandObjectMultiword {
 
 } // namespace lldb_private
 
-#endif // LLDB_SOURCE_COMMANDS_COMMANDOBJECTMCP_H
+#endif // LLDB_SOURCE_COMMANDS_COMMANDOBJECTPROTOCOLSERVER_H
diff --git a/lldb/source/Commands/CommandObjectRegexCommand.h 
b/lldb/source/Commands/CommandObjectRegexCommand.h
index c78b0b586c375..ee92119e26b79 100644
--- a/lldb/source/Commands/CommandObjectRegexCommand.h
+++ b/lldb/source/Commands/CommandObjectRegexCommand.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_INTERPRETER_COMMANDOBJECTREGEXCOMMAND_H
-#define LLDB_INTERPRETER_COMMANDOBJECTREGEXCOMMAND_H
+#ifndef LLDB_SOURCE_COMMANDS_COMMANDOBJECTREGEXCOMMAND_H
+#define LLDB_SOURCE_COMMANDS_COMMANDOBJECTREGEXCOMMAND_H
 
 #include <list>
 
@@ -62,4 +62,4 @@ class CommandObjectRegexCommand : public CommandObjectRaw {
 
 } // namespace lldb_private
 
-#endif // LLDB_INTERPRETER_COMMANDOBJECTREGEXCOMMAND_H
+#endif // LLDB_SOURCE_COMMANDS_COMMANDOBJECTREGEXCOMMAND_H
diff --git a/lldb/source/Commands/CommandObjectScripting.h 
b/lldb/source/Commands/CommandObjectScripting.h
index 0ccd579deec0e..1daabb1ec6da6 100644
--- a/lldb/source/Commands/CommandObjectScripting.h
+++ b/lldb/source/Commands/CommandObjectScripting.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_INTERPRETER_COMMANDOBJECTSCRIPTING_H
-#define LLDB_SOURCE_INTERPRETER_COMMANDOBJECTSCRIPTING_H
+#ifndef LLDB_SOURCE_COMMANDS_COMMANDOBJECTSCRIPTING_H
+#define LLDB_SOURCE_COMMANDS_COMMANDOBJECTSCRIPTING_H
 
 #include "lldb/Interpreter/CommandObjectMultiword.h"
 
@@ -22,4 +22,4 @@ class CommandObjectMultiwordScripting : public 
CommandObjectMultiword {
 
 } // namespace lldb_private
 
-#endif // LLDB_SOURCE_INTERPRETER_COMMANDOBJECTSCRIPTING_H
+#endif // LLDB_SOURCE_COMMANDS_COMMANDOBJECTSCRIPTING_H
diff --git a/lldb/source/Host/macosx/objcxx/PosixSpawnResponsible.h 
b/lldb/source/Host/macosx/objcxx/PosixSpawnResponsible.h
index 23caa4f9a55e0..1c190bbf0b2df 100644
--- a/lldb/source/Host/macosx/objcxx/PosixSpawnResponsible.h
+++ b/lldb/source/Host/macosx/objcxx/PosixSpawnResponsible.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_HOST_POSIXSPAWNRESPONSIBLE_H
-#define LLDB_HOST_POSIXSPAWNRESPONSIBLE_H
+#ifndef LLDB_SOURCE_HOST_MACOSX_OBJCXX_POSIXSPAWNRESPONSIBLE_H
+#define LLDB_SOURCE_HOST_MACOSX_OBJCXX_POSIXSPAWNRESPONSIBLE_H
 
 #include <spawn.h>
 
@@ -31,4 +31,4 @@ static inline int 
setup_posix_spawn_responsible_flag(posix_spawnattr_t *attr) {
   return 0;
 }
 
-#endif // LLDB_HOST_POSIXSPAWNRESPONSIBLE_H
+#endif // LLDB_SOURCE_HOST_MACOSX_OBJCXX_POSIXSPAWNRESPONSIBLE_H
diff --git a/lldb/source/Plugins/ABI/RISCV/ABISysV_riscv.h 
b/lldb/source/Plugins/ABI/RISCV/ABISysV_riscv.h
index 539a45de5ee77..b047c5f96865d 100644
--- a/lldb/source/Plugins/ABI/RISCV/ABISysV_riscv.h
+++ b/lldb/source/Plugins/ABI/RISCV/ABISysV_riscv.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef liblldb_ABISysV_riscv_h_
-#define liblldb_ABISysV_riscv_h_
+#ifndef LLDB_SOURCE_PLUGINS_ABI_RISCV_ABISYSV_RISCV_H
+#define LLDB_SOURCE_PLUGINS_ABI_RISCV_ABISYSV_RISCV_H
 
 // Other libraries and framework includes
 #include "llvm/TargetParser/Triple.h"
@@ -125,4 +125,4 @@ class ABISysV_riscv : public lldb_private::RegInfoBasedABI {
   bool m_is_rv64; // true if target is riscv64; false if target is riscv32
 };
 
-#endif // liblldb_ABISysV_riscv_h_
+#endif // LLDB_SOURCE_PLUGINS_ABI_RISCV_ABISYSV_RISCV_H
diff --git 
a/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h 
b/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h
index 5ed855395cca7..07b3f9673a9c5 100644
--- a/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h
+++ b/lldb/source/Plugins/DynamicLoader/wasm-DYLD/DynamicLoaderWasmDYLD.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef liblldb_Plugins_DynamicLoaderWasmDYLD_h_
-#define liblldb_Plugins_DynamicLoaderWasmDYLD_h_
+#ifndef LLDB_SOURCE_PLUGINS_DYNAMICLOADER_WASM_DYLD_DYNAMICLOADERWASMDYLD_H
+#define LLDB_SOURCE_PLUGINS_DYNAMICLOADER_WASM_DYLD_DYNAMICLOADERWASMDYLD_H
 
 #include "lldb/Target/DynamicLoader.h"
 
@@ -49,4 +49,4 @@ class DynamicLoaderWasmDYLD : public DynamicLoader {
 } // namespace wasm
 } // namespace lldb_private
 
-#endif // liblldb_Plugins_DynamicLoaderWasmDYLD_h_
+#endif // LLDB_SOURCE_PLUGINS_DYNAMICLOADER_WASM_DYLD_DYNAMICLOADERWASMDYLD_H
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionUtil.h 
b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionUtil.h
index fb8b857256c0b..cd5dd7c33d5a5 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionUtil.h
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangExpressionUtil.h
@@ -27,4 +27,4 @@ lldb::ValueObjectSP GetLambdaValueObject(StackFrame *frame);
 } // namespace ClangExpressionUtil
 } // namespace lldb_private
 
-#endif // LLDB_SOURCE_PLUGINS_EXPRESSIONPARSER_CLANG_CLANGEXPRESSIONHELPER_H
+#endif // LLDB_SOURCE_PLUGINS_EXPRESSIONPARSER_CLANG_CLANGEXPRESSIONUTIL_H
diff --git a/lldb/source/Plugins/ExpressionParser/Clang/NameSearchContext.h 
b/lldb/source/Plugins/ExpressionParser/Clang/NameSearchContext.h
index a890c935a48fa..60df2b0c7256a 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/NameSearchContext.h
+++ b/lldb/source/Plugins/ExpressionParser/Clang/NameSearchContext.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_EXPRESSIONPARSER_CLANG_NAME_SEARCH_CONTEXT_H
-#define LLDB_SOURCE_PLUGINS_EXPRESSIONPARSER_CLANG_NAME_SEARCH_CONTEXT_H
+#ifndef LLDB_SOURCE_PLUGINS_EXPRESSIONPARSER_CLANG_NAMESEARCHCONTEXT_H
+#define LLDB_SOURCE_PLUGINS_EXPRESSIONPARSER_CLANG_NAMESEARCHCONTEXT_H
 
 #include "Plugins/ExpressionParser/Clang/ClangASTImporter.h"
 #include "Plugins/TypeSystem/Clang/TypeSystemClang.h"
@@ -119,4 +119,4 @@ struct NameSearchContext {
 
 } // namespace lldb_private
 
-#endif // LLDB_SOURCE_PLUGINS_EXPRESSIONPARSER_CLANG_NAME_SEARCH_CONTEXT_H
+#endif // LLDB_SOURCE_PLUGINS_EXPRESSIONPARSER_CLANG_NAMESEARCHCONTEXT_H
diff --git a/lldb/source/Plugins/Highlighter/Clang/ClangHighlighter.h 
b/lldb/source/Plugins/Highlighter/Clang/ClangHighlighter.h
index 51a0461ca88ed..260c3fb4ab426 100644
--- a/lldb/source/Plugins/Highlighter/Clang/ClangHighlighter.h
+++ b/lldb/source/Plugins/Highlighter/Clang/ClangHighlighter.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_HIGHLIGHTER_CLANGHIGHLIGHTER_H
-#define LLDB_SOURCE_PLUGINS_HIGHLIGHTER_CLANGHIGHLIGHTER_H
+#ifndef LLDB_SOURCE_PLUGINS_HIGHLIGHTER_CLANG_CLANGHIGHLIGHTER_H
+#define LLDB_SOURCE_PLUGINS_HIGHLIGHTER_CLANG_CLANGHIGHLIGHTER_H
 
 #include "lldb/Utility/Stream.h"
 #include "llvm/ADT/StringSet.h"
diff --git a/lldb/source/Plugins/Highlighter/Default/DefaultHighlighter.h 
b/lldb/source/Plugins/Highlighter/Default/DefaultHighlighter.h
index ad8776a009580..4fa6c4f91e290 100644
--- a/lldb/source/Plugins/Highlighter/Default/DefaultHighlighter.h
+++ b/lldb/source/Plugins/Highlighter/Default/DefaultHighlighter.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_HIGHLIGHTER_DEFAULTHIGHLIGHTER_H
-#define LLDB_SOURCE_PLUGINS_HIGHLIGHTER_DEFAULTHIGHLIGHTER_H
+#ifndef LLDB_SOURCE_PLUGINS_HIGHLIGHTER_DEFAULT_DEFAULTHIGHLIGHTER_H
+#define LLDB_SOURCE_PLUGINS_HIGHLIGHTER_DEFAULT_DEFAULTHIGHLIGHTER_H
 
 #include "lldb/Core/Highlighter.h"
 
diff --git a/lldb/source/Plugins/Instruction/RISCV/RISCVCInstructions.h 
b/lldb/source/Plugins/Instruction/RISCV/RISCVCInstructions.h
index 867f067f24b38..54140703d7049 100644
--- a/lldb/source/Plugins/Instruction/RISCV/RISCVCInstructions.h
+++ b/lldb/source/Plugins/Instruction/RISCV/RISCVCInstructions.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_INSTRUCTION_RISCV_RISCVCINSTRUCTION_H
-#define LLDB_SOURCE_PLUGINS_INSTRUCTION_RISCV_RISCVCINSTRUCTION_H
+#ifndef LLDB_SOURCE_PLUGINS_INSTRUCTION_RISCV_RISCVCINSTRUCTIONS_H
+#define LLDB_SOURCE_PLUGINS_INSTRUCTION_RISCV_RISCVCINSTRUCTIONS_H
 
 #include <cstdint>
 #include <variant>
@@ -354,4 +354,4 @@ RISCVInst DecodeC_FSD(uint32_t inst) {
 }
 
 } // namespace lldb_private
-#endif // LLDB_SOURCE_PLUGINS_INSTRUCTION_RISCV_RISCVCINSTRUCTION_H
+#endif // LLDB_SOURCE_PLUGINS_INSTRUCTION_RISCV_RISCVCINSTRUCTIONS_H
diff --git a/lldb/source/Plugins/Instruction/RISCV/RISCVInstructions.h 
b/lldb/source/Plugins/Instruction/RISCV/RISCVInstructions.h
index 252cef805408c..f6628e2600b9f 100644
--- a/lldb/source/Plugins/Instruction/RISCV/RISCVInstructions.h
+++ b/lldb/source/Plugins/Instruction/RISCV/RISCVInstructions.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_INSTRUCTION_RISCV_RISCVINSTRUCTION_H
-#define LLDB_SOURCE_PLUGINS_INSTRUCTION_RISCV_RISCVINSTRUCTION_H
+#ifndef LLDB_SOURCE_PLUGINS_INSTRUCTION_RISCV_RISCVINSTRUCTIONS_H
+#define LLDB_SOURCE_PLUGINS_INSTRUCTION_RISCV_RISCVINSTRUCTIONS_H
 
 #include <cstdint>
 #include <optional>
@@ -349,4 +349,4 @@ constexpr uint32_t NanUnBoxing(uint64_t val) {
 #undef DERIVE_EQ
 
 } // namespace lldb_private
-#endif // LLDB_SOURCE_PLUGINS_INSTRUCTION_RISCV_RISCVINSTRUCTION_H
+#endif // LLDB_SOURCE_PLUGINS_INSTRUCTION_RISCV_RISCVINSTRUCTIONS_H
diff --git 
a/lldb/source/Plugins/InstrumentationRuntime/BoundsSafety/InstrumentationRuntimeBoundsSafety.h
 
b/lldb/source/Plugins/InstrumentationRuntime/BoundsSafety/InstrumentationRuntimeBoundsSafety.h
index 06c30f8febca8..206c34492d601 100644
--- 
a/lldb/source/Plugins/InstrumentationRuntime/BoundsSafety/InstrumentationRuntimeBoundsSafety.h
+++ 
b/lldb/source/Plugins/InstrumentationRuntime/BoundsSafety/InstrumentationRuntimeBoundsSafety.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_INSTRUMENTATIONRUNTIME_BOUNDS_SAFETY_SOFT_TRAP_H
-#define LLDB_SOURCE_PLUGINS_INSTRUMENTATIONRUNTIME_BOUNDS_SAFETY_SOFT_TRAP_H
+#ifndef 
LLDB_SOURCE_PLUGINS_INSTRUMENTATIONRUNTIME_BOUNDSSAFETY_INSTRUMENTATIONRUNTIMEBOUNDSSAFETY_H
+#define 
LLDB_SOURCE_PLUGINS_INSTRUMENTATIONRUNTIME_BOUNDSSAFETY_INSTRUMENTATIONRUNTIMEBOUNDSSAFETY_H
 
 #include "lldb/Target/ABI.h"
 #include "lldb/Target/InstrumentationRuntime.h"
diff --git 
a/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.h 
b/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.h
index a45339a5809c0..456b65aaf7a09 100644
--- a/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.h
+++ b/lldb/source/Plugins/InstrumentationRuntime/Utility/ReportRetriever.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_INSTRUMENTATIONRUNTIME_UTILITY_REPORTRETRIEVER_H
+#define LLDB_SOURCE_PLUGINS_INSTRUMENTATIONRUNTIME_UTILITY_REPORTRETRIEVER_H
+
 //===-- ReportRetriever.h ---------------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -32,3 +35,5 @@ class ReportRetriever {
 } // namespace lldb_private
 
 #endif // LLDB_SOURCE_PLUGINS_INSTRUMENTATIONRUNTIME_UTILITY_REPORTRETRIEVER_H
+
+#endif
diff --git 
a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/VerboseTrapFrameRecognizer.h 
b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/VerboseTrapFrameRecognizer.h
index 7d7020f63c8d2..6df936a96d11b 100644
--- a/lldb/source/Plugins/LanguageRuntime/CPlusPlus/VerboseTrapFrameRecognizer.h
+++ b/lldb/source/Plugins/LanguageRuntime/CPlusPlus/VerboseTrapFrameRecognizer.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_SOURCE_PLUGINS_LANGUAGERUNTIME_C_PLUS_PLUS_VERBOSETRAPFRAMERECOGNIZER_H
-#define 
LLDB_SOURCE_PLUGINS_LANGUAGERUNTIME_C_PLUS_PLUS_VERBOSETRAPFRAMERECOGNIZER_H
+#ifndef 
LLDB_SOURCE_PLUGINS_LANGUAGERUNTIME_CPLUSPLUS_VERBOSETRAPFRAMERECOGNIZER_H
+#define 
LLDB_SOURCE_PLUGINS_LANGUAGERUNTIME_CPLUSPLUS_VERBOSETRAPFRAMERECOGNIZER_H
 
 #include "lldb/Target/StackFrameRecognizer.h"
 
@@ -44,4 +44,4 @@ class VerboseTrapFrameRecognizer : public 
StackFrameRecognizer {
 
 } // namespace lldb_private
 
-#endif // 
LLDB_SOURCE_PLUGINS_LANGUAGERUNTIME_C_PLUS_PLUS_VERBOSETRAPFRAMERECOGNIZER_H
+#endif // 
LLDB_SOURCE_PLUGINS_LANGUAGERUNTIME_CPLUSPLUS_VERBOSETRAPFRAMERECOGNIZER_H
diff --git 
a/lldb/source/Plugins/ObjectContainer/Mach-O-Fileset/ObjectContainerMachOFileset.h
 
b/lldb/source/Plugins/ObjectContainer/Mach-O-Fileset/ObjectContainerMachOFileset.h
index f94f07855a0e7..1ba667394ae7e 100644
--- 
a/lldb/source/Plugins/ObjectContainer/Mach-O-Fileset/ObjectContainerMachOFileset.h
+++ 
b/lldb/source/Plugins/ObjectContainer/Mach-O-Fileset/ObjectContainerMachOFileset.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_SOURCE_PLUGINS_OBJECTCONTAINER_MACH_O_FILESET_OBJECTCONTAINERMADCHOFILESET_H
-#define 
LLDB_SOURCE_PLUGINS_OBJECTCONTAINER_MACH_O_FILESET_OBJECTCONTAINERMADCHOFILESET_H
+#ifndef 
LLDB_SOURCE_PLUGINS_OBJECTCONTAINER_MACH_O_FILESET_OBJECTCONTAINERMACHOFILESET_H
+#define 
LLDB_SOURCE_PLUGINS_OBJECTCONTAINER_MACH_O_FILESET_OBJECTCONTAINERMACHOFILESET_H
 
 #include "lldb/Host/SafeMachO.h"
 #include "lldb/Symbol/ObjectContainer.h"
@@ -91,4 +91,4 @@ class ObjectContainerMachOFileset : public 
lldb_private::ObjectContainer {
 
 } // namespace lldb_private
 
-#endif // 
LLDB_SOURCE_PLUGINS_OBJECTCONTAINER_MACH_O_FILESET_OBJECTCONTAINERMADCHOFILESET_H
+#endif // 
LLDB_SOURCE_PLUGINS_OBJECTCONTAINER_MACH_O_FILESET_OBJECTCONTAINERMACHOFILESET_H
diff --git a/lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.h 
b/lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.h
index 8117539c063a3..b3b9229cfd208 100644
--- a/lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.h
+++ b/lldb/source/Plugins/ObjectFile/XCOFF/ObjectFileXCOFF.h
@@ -122,4 +122,4 @@ class ObjectFileXCOFF : public lldb_private::ObjectFile {
   std::unique_ptr<llvm::object::XCOFFObjectFile> m_binary;
 };
 
-#endif // LLDB_SOURCE_PLUGINS_OBJECTFILE_XCOFF_OBJECTFILE_H
+#endif // LLDB_SOURCE_PLUGINS_OBJECTFILE_XCOFF_OBJECTFILEXCOFF_H
diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h 
b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h
index 980a544241de4..1e4517dbf7800 100644
--- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h
+++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef liblldb_OperatingSystemPython_h_
-#define liblldb_OperatingSystemPython_h_
+#ifndef LLDB_SOURCE_PLUGINS_OPERATINGSYSTEM_PYTHON_OPERATINGSYSTEMPYTHON_H
+#define LLDB_SOURCE_PLUGINS_OPERATINGSYSTEM_PYTHON_OPERATINGSYSTEMPYTHON_H
 
 #include "lldb/Host/Config.h"
 
@@ -84,4 +84,4 @@ class OperatingSystemPython : public 
lldb_private::OperatingSystem {
 
 #endif // LLDB_ENABLE_PYTHON
 
-#endif // liblldb_OperatingSystemPython_h_
+#endif // LLDB_SOURCE_PLUGINS_OPERATINGSYSTEM_PYTHON_OPERATINGSYSTEMPYTHON_H
diff --git a/lldb/source/Plugins/Platform/WebAssembly/PlatformWasm.h 
b/lldb/source/Plugins/Platform/WebAssembly/PlatformWasm.h
index fe16961e9e8a5..5744ca7d0ca22 100644
--- a/lldb/source/Plugins/Platform/WebAssembly/PlatformWasm.h
+++ b/lldb/source/Plugins/Platform/WebAssembly/PlatformWasm.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_PLATFORM_WASM_PLATFORMWASM_H
-#define LLDB_SOURCE_PLUGINS_PLATFORM_WASM_PLATFORMWASM_H
+#ifndef LLDB_SOURCE_PLUGINS_PLATFORM_WEBASSEMBLY_PLATFORMWASM_H
+#define LLDB_SOURCE_PLUGINS_PLATFORM_WEBASSEMBLY_PLATFORMWASM_H
 
 #include "lldb/Host/Host.h"
 #include "lldb/Host/HostInfo.h"
@@ -64,4 +64,4 @@ class PlatformWasm : public RemoteAwarePlatform {
 
 } // namespace lldb_private
 
-#endif // LLDB_SOURCE_PLUGINS_PLATFORM_WASM_PLATFORMWASM_H
+#endif // LLDB_SOURCE_PLUGINS_PLATFORM_WEBASSEMBLY_PLATFORMWASM_H
diff --git 
a/lldb/source/Plugins/Platform/WebAssembly/PlatformWasmRemoteGDBServer.h 
b/lldb/source/Plugins/Platform/WebAssembly/PlatformWasmRemoteGDBServer.h
index fa37fb61ce225..2c7a6c4eb8a86 100644
--- a/lldb/source/Plugins/Platform/WebAssembly/PlatformWasmRemoteGDBServer.h
+++ b/lldb/source/Plugins/Platform/WebAssembly/PlatformWasmRemoteGDBServer.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_PLATFORM_WASM_PLATFORMWASMREMOTEGDBSERVER_H
-#define LLDB_SOURCE_PLUGINS_PLATFORM_WASM_PLATFORMWASMREMOTEGDBSERVER_H
+#ifndef LLDB_SOURCE_PLUGINS_PLATFORM_WEBASSEMBLY_PLATFORMWASMREMOTEGDBSERVER_H
+#define LLDB_SOURCE_PLUGINS_PLATFORM_WEBASSEMBLY_PLATFORMWASMREMOTEGDBSERVER_H
 
 #include "Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h"
 
@@ -30,4 +30,4 @@ class PlatformWasmRemoteGDBServer
 
 } // namespace lldb_private
 
-#endif // LLDB_SOURCE_PLUGINS_PLATFORM_WASM_PLATFORMWASMREMOTEGDBSERVER_H
+#endif // 
LLDB_SOURCE_PLUGINS_PLATFORM_WEBASSEMBLY_PLATFORMWASMREMOTEGDBSERVER_H
diff --git 
a/lldb/source/Plugins/Process/Utility/NativeProcessSoftwareSingleStep.h 
b/lldb/source/Plugins/Process/Utility/NativeProcessSoftwareSingleStep.h
index e30e9594359fa..4e3fca30684fa 100644
--- a/lldb/source/Plugins/Process/Utility/NativeProcessSoftwareSingleStep.h
+++ b/lldb/source/Plugins/Process/Utility/NativeProcessSoftwareSingleStep.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef lldb_NativeProcessSoftwareSingleStep_h
-#define lldb_NativeProcessSoftwareSingleStep_h
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEPROCESSSOFTWARESINGLESTEP_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEPROCESSSOFTWARESINGLESTEP_H
 
 #include "lldb/Host/common/NativeProcessProtocol.h"
 #include "lldb/Host/common/NativeThreadProtocol.h"
@@ -29,4 +29,4 @@ class NativeProcessSoftwareSingleStep {
 
 } // namespace lldb_private
 
-#endif // #ifndef lldb_NativeProcessSoftwareSingleStep_h
+#endif // LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEPROCESSSOFTWARESINGLESTEP_H
diff --git a/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg.h 
b/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg.h
index 2dd11dcf74de3..721c15e1ee900 100644
--- a/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg.h
+++ b/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef lldb_NativeRegisterContextDBReg_h
-#define lldb_NativeRegisterContextDBReg_h
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_H
 
 #include "Plugins/Process/Utility/NativeRegisterContextRegisterInfo.h"
 
@@ -105,4 +105,4 @@ class NativeRegisterContextDBReg
 
 } // namespace lldb_private
 
-#endif // #ifndef lldb_NativeRegisterContextDBReg_h
+#endif // LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_H
diff --git 
a/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm.h 
b/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm.h
index 253ae96c90c9d..0d1de2ae2d89b 100644
--- a/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm.h
+++ b/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef lldb_NativeRegisterContextDBReg_arm_h
-#define lldb_NativeRegisterContextDBReg_arm_h
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_ARM_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_ARM_H
 
 #include "Plugins/Process/Utility/NativeRegisterContextDBReg.h"
 
@@ -39,4 +39,4 @@ class NativeRegisterContextDBReg_arm : public 
NativeRegisterContextDBReg {
 
 } // namespace lldb_private
 
-#endif // #ifndef lldb_NativeRegisterContextDBReg_arm_h
+#endif // LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_ARM_H
diff --git 
a/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm64.h 
b/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm64.h
index 42d6bacf64861..0dfa5e03fc27b 100644
--- a/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm64.h
+++ b/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_arm64.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef lldb_NativeRegisterContextDBReg_arm64_h
-#define lldb_NativeRegisterContextDBReg_arm64_h
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_ARM64_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_ARM64_H
 
 #include "Plugins/Process/Utility/NativeRegisterContextDBReg.h"
 
@@ -31,4 +31,4 @@ class NativeRegisterContextDBReg_arm64 : public 
NativeRegisterContextDBReg {
 
 } // namespace lldb_private
 
-#endif // #ifndef lldb_NativeRegisterContextDBReg_arm64_h
+#endif // 
LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_ARM64_H
diff --git 
a/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_loongarch.h 
b/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_loongarch.h
index 19c5e4cdea263..703f41f3c298b 100644
--- a/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_loongarch.h
+++ b/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_loongarch.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef lldb_NativeRegisterContextDBReg_loongarch_h
-#define lldb_NativeRegisterContextDBReg_loongarch_h
+#ifndef 
LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_LOONGARCH_H
+#define 
LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_LOONGARCH_H
 
 #include "Plugins/Process/Utility/NativeRegisterContextDBReg.h"
 
@@ -31,4 +31,4 @@ class NativeRegisterContextDBReg_loongarch : public 
NativeRegisterContextDBReg {
 
 } // namespace lldb_private
 
-#endif // #ifndef lldb_NativeRegisterContextDBReg_loongarch_h
+#endif // 
LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_LOONGARCH_H
diff --git 
a/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_x86.h 
b/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_x86.h
index 4ca288d9dff76..2fdf5000f751c 100644
--- a/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_x86.h
+++ b/lldb/source/Plugins/Process/Utility/NativeRegisterContextDBReg_x86.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef lldb_NativeRegisterContextDBReg_x86_h
-#define lldb_NativeRegisterContextDBReg_x86_h
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_X86_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_X86_H
 
 #include "Plugins/Process/Utility/NativeRegisterContextRegisterInfo.h"
 
@@ -51,4 +51,4 @@ class NativeRegisterContextDBReg_x86
 
 } // namespace lldb_private
 
-#endif // #ifndef lldb_NativeRegisterContextDBReg_x86_h
+#endif // LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_NATIVEREGISTERCONTEXTDBREG_X86_H
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_ppc64.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_ppc64.h
index 4805883e5b848..177ff439828e8 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_ppc64.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfoPOSIX_ppc64.h
@@ -28,4 +28,4 @@ class RegisterInfoPOSIX_ppc64 : public 
lldb_private::RegisterInfoInterface {
   uint32_t m_register_info_count;
 };
 
-#endif // #ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOPOSIX_PPC64_H
+#endif // LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOPOSIX_PPC64_H
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h
index f535ca40c4030..12342a37d6191 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_ARM_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_ARM_H
+
 //===-- RegisterInfos_arm.h -------------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -791,3 +794,5 @@ static RegisterInfo g_register_infos_arm[] = {
     {DEFINE_DBG(wcr, 15)}};
 
 #endif // DECLARE_REGISTER_INFOS_ARM_STRUCT
+
+#endif
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h
index 829fa076d221e..39168d0a96479 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_ARM64_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_ARM64_H
+
 //===-- RegisterInfos_arm64.h -----------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -801,3 +804,5 @@ static lldb_private::RegisterInfo 
g_register_infos_arm64_le[] = {
 // clang-format on
 
 #endif // DECLARE_REGISTER_INFOS_ARM64_STRUCT
+
+#endif
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64_sve.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64_sve.h
index 283c4c17e7605..bde1ce2bbb22b 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64_sve.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_arm64_sve.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_ARM64_SVE_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_ARM64_SVE_H
+
 //===-- RegisterInfos_arm64_sve.h -------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -571,3 +574,5 @@ static lldb_private::RegisterInfo 
g_register_infos_arm64_sve_le[] = {
 };
 
 #endif // DECLARE_REGISTER_INFOS_ARM64_SVE_STRUCT
+
+#endif
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h
index e9f8065bffd8c..72ab95d936238 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_i386.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_I386_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_I386_H
+
 //===-- RegisterInfos_i386.h ------------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -308,3 +311,5 @@ static_assert((sizeof(g_register_infos_i386) /
 #undef DEFINE_GPR_PSEUDO_8L
 
 #endif // DECLARE_REGISTER_INFOS_I386_STRUCT
+
+#endif
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_loongarch64.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_loongarch64.h
index ff8fe5990ce11..715c3fd9f6912 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_loongarch64.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_loongarch64.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_LOONGARCH64_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_LOONGARCH64_H
+
 //===-- RegisterInfos_loongarch64.h -----------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -258,3 +261,5 @@ static lldb_private::RegisterInfo 
g_register_infos_loongarch64[] = {
 };
 
 #endif // DECLARE_REGISTER_INFOS_LOONGARCH64_STRUCT
+
+#endif
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h
index 31f79f5379110..8a5784c849e76 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_powerpc.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_POWERPC_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_POWERPC_H
+
 //===-- RegisterInfos_powerpc.h ---------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -226,3 +229,5 @@ static_assert(sizeof(g_register_infos_powerpc64_32) ==
 #endif // DECLARE_REGISTER_INFOS_POWERPC_STRUCT
 
 #undef GPR_OFFSET
+
+#endif
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h
index 5ea561fe22b42..b9069ed607b1f 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_PPC64_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_PPC64_H
+
 //===-- RegisterInfos_ppc64.h -----------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -487,3 +490,5 @@ static_assert((sizeof(g_register_infos_ppc64) /
 #undef DEFINE_VSX_PPC64
 
 #endif // DECLARE_REGISTER_INFOS_PPC64_STRUCT
+
+#endif
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h
index 18489fb74f86e..b03fb6e46bded 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_ppc64le.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_PPC64LE_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_PPC64LE_H
+
 //===-- RegisterInfos_ppc64le.h ---------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -472,3 +475,5 @@ static_assert((sizeof(g_register_infos_ppc64le) /
 #undef DEFINE_VSX
 
 #endif // DECLARE_REGISTER_INFOS_PPC64LE_STRUCT
+
+#endif
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_riscv32.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_riscv32.h
index ab6fec829bbce..1482304f36f94 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_riscv32.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_riscv32.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_RISCV32_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_RISCV32_H
+
 //===-- RegisterInfos_riscv32.h ---------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -183,3 +186,5 @@ static lldb_private::RegisterInfo 
g_register_infos_riscv32_le[] = {
 };
 
 #endif // DECLARE_REGISTER_INFOS_RISCV32_STRUCT
+
+#endif
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_riscv64.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_riscv64.h
index 628ed3770bdc0..f0621c80d7080 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_riscv64.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_riscv64.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_RISCV64_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_RISCV64_H
+
 //===-- RegisterInfos_riscv64.h ---------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -172,3 +175,5 @@ static lldb_private::RegisterInfo 
g_register_infos_riscv64_vpr[] = {
 };
 
 #endif // DECLARE_REGISTER_INFOS_RISCV64_STRUCT
+
+#endif
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h
index 7b5f204ebbadc..e0b536658b1a4 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_s390x.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_S390X_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_S390X_H
+
 //===-- RegisterInfos_s390x.h -----------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -122,3 +125,5 @@ static_assert((sizeof(g_register_infos_s390x) /
 #undef DEFINE_FPR_NODWARF
 
 #endif // DECLARE_REGISTER_INFOS_S390X_STRUCT
+
+#endif
diff --git a/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h
index 1634381581550..9fcfbf12758f5 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_X86_64_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_X86_64_H
+
 //===-- RegisterInfos_x86_64.h ----------------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -484,3 +487,5 @@ UPDATE_DR_INFO(7);
 #undef GPR_OFFSET
 #undef FPR_OFFSET
 #undef YMM_OFFSET
+
+#endif
diff --git 
a/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64_with_base.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64_with_base.h
index b111d8f62d1f3..435a24b2950ba 100644
--- a/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64_with_base.h
+++ b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64_with_base.h
@@ -1,3 +1,6 @@
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_X86_64_WITH_BASE_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_X86_64_WITH_BASE_H
+
 //===-- RegisterInfos_x86_64_with_base.h ------------------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -469,3 +472,5 @@ UPDATE_DR_INFO(7);
 #undef GPR_OFFSET
 #undef FPR_OFFSET
 #undef YMM_OFFSET
+
+#endif
diff --git 
a/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64_with_base_shared.h 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64_with_base_shared.h
index 5e4406c1fa275..57d2dd7a5c245 100644
--- 
a/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64_with_base_shared.h
+++ 
b/lldb/source/Plugins/Process/Utility/RegisterInfos_x86_64_with_base_shared.h
@@ -1,3 +1,6 @@
+#ifndef 
LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_X86_64_WITH_BASE_SHARED_H
+#define 
LLDB_SOURCE_PLUGINS_PROCESS_UTILITY_REGISTERINFOS_X86_64_WITH_BASE_SHARED_H
+
 //===-- RegisterInfos_x86_64_with_base_shared.h -----------------*- C++ 
-*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM 
Exceptions.
@@ -140,3 +143,5 @@ RegInfo &GetRegInfoShared(llvm::Triple::ArchType arch_type, 
bool with_base);
 } // namespace lldb_private
 
 #endif // ifndef lldb_RegisterInfos_x86_64_with_base_shared_h
+
+#endif
diff --git a/lldb/source/Plugins/Process/mach-core/RegisterContextUnifiedCore.h 
b/lldb/source/Plugins/Process/mach-core/RegisterContextUnifiedCore.h
index 971d5cb568462..c6ddede4167c8 100644
--- a/lldb/source/Plugins/Process/mach-core/RegisterContextUnifiedCore.h
+++ b/lldb/source/Plugins/Process/mach-core/RegisterContextUnifiedCore.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_PROCESS_REGISTERCONTEXT_UNIFIED_CORE_H
-#define LLDB_SOURCE_PLUGINS_PROCESS_REGISTERCONTEXT_UNIFIED_CORE_H
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_MACH_CORE_REGISTERCONTEXTUNIFIEDCORE_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_MACH_CORE_REGISTERCONTEXTUNIFIEDCORE_H
 
 #include <string>
 #include <vector>
@@ -54,4 +54,4 @@ class RegisterContextUnifiedCore : public RegisterContext {
 
 } // namespace lldb_private
 
-#endif // LLDB_SOURCE_PLUGINS_PROCESS_REGISTERCONTEXT_UNIFIED_CORE_H
+#endif // LLDB_SOURCE_PLUGINS_PROCESS_MACH_CORE_REGISTERCONTEXTUNIFIEDCORE_H
diff --git a/lldb/source/Plugins/Process/scripted/ScriptedFrame.h 
b/lldb/source/Plugins/Process/scripted/ScriptedFrame.h
index fe154792c745b..2bf62c06cdd19 100644
--- a/lldb/source/Plugins/Process/scripted/ScriptedFrame.h
+++ b/lldb/source/Plugins/Process/scripted/ScriptedFrame.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_SCRIPTED_FRAME_H
-#define LLDB_SOURCE_PLUGINS_SCRIPTED_FRAME_H
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_SCRIPTED_SCRIPTEDFRAME_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_SCRIPTED_SCRIPTEDFRAME_H
 
 #include "ScriptedThread.h"
 #include "lldb/Target/DynamicRegisterInfo.h"
@@ -109,4 +109,4 @@ class ScriptedFrame : public lldb_private::StackFrame {
 
 } // namespace lldb_private
 
-#endif // LLDB_SOURCE_PLUGINS_SCRIPTED_FRAME_H
+#endif // LLDB_SOURCE_PLUGINS_PROCESS_SCRIPTED_SCRIPTEDFRAME_H
diff --git a/lldb/source/Plugins/Process/scripted/ScriptedProcess.h 
b/lldb/source/Plugins/Process/scripted/ScriptedProcess.h
index 8ebe4ca5f3d44..dad4e6f1e61fe 100644
--- a/lldb/source/Plugins/Process/scripted/ScriptedProcess.h
+++ b/lldb/source/Plugins/Process/scripted/ScriptedProcess.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_SCRIPTED_PROCESS_H
-#define LLDB_SOURCE_PLUGINS_SCRIPTED_PROCESS_H
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_SCRIPTED_SCRIPTEDPROCESS_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_SCRIPTED_SCRIPTEDPROCESS_H
 
 #include "lldb/Target/Process.h"
 #include "lldb/Utility/ConstString.h"
@@ -133,4 +133,4 @@ class ScriptedProcess : public Process {
 
 } // namespace lldb_private
 
-#endif // LLDB_SOURCE_PLUGINS_SCRIPTED_PROCESS_H
+#endif // LLDB_SOURCE_PLUGINS_PROCESS_SCRIPTED_SCRIPTEDPROCESS_H
diff --git a/lldb/source/Plugins/Process/scripted/ScriptedThread.h 
b/lldb/source/Plugins/Process/scripted/ScriptedThread.h
index ee5ace4059673..d5a97fd38146f 100644
--- a/lldb/source/Plugins/Process/scripted/ScriptedThread.h
+++ b/lldb/source/Plugins/Process/scripted/ScriptedThread.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_SCRIPTED_THREAD_H
-#define LLDB_SOURCE_PLUGINS_SCRIPTED_THREAD_H
+#ifndef LLDB_SOURCE_PLUGINS_PROCESS_SCRIPTED_SCRIPTEDTHREAD_H
+#define LLDB_SOURCE_PLUGINS_PROCESS_SCRIPTED_SCRIPTEDTHREAD_H
 
 #include <string>
 
@@ -80,4 +80,4 @@ class ScriptedThread : public lldb_private::Thread {
 
 } // namespace lldb_private
 
-#endif // LLDB_SOURCE_PLUGINS_SCRIPTED_THREAD_H
+#endif // LLDB_SOURCE_PLUGINS_PROCESS_SCRIPTED_SCRIPTEDTHREAD_H
diff --git a/lldb/source/Plugins/Protocol/MCP/ProtocolServerMCP.h 
b/lldb/source/Plugins/Protocol/MCP/ProtocolServerMCP.h
index abcd251337052..1cd837d9ec755 100644
--- a/lldb/source/Plugins/Protocol/MCP/ProtocolServerMCP.h
+++ b/lldb/source/Plugins/Protocol/MCP/ProtocolServerMCP.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_PLUGINS_PROTOCOL_MCP_PROTOCOLSERVERMCP_H
-#define LLDB_PLUGINS_PROTOCOL_MCP_PROTOCOLSERVERMCP_H
+#ifndef LLDB_SOURCE_PLUGINS_PROTOCOL_MCP_PROTOCOLSERVERMCP_H
+#define LLDB_SOURCE_PLUGINS_PROTOCOL_MCP_PROTOCOLSERVERMCP_H
 
 #include "lldb/Core/ProtocolServer.h"
 #include "lldb/Host/MainLoop.h"
diff --git a/lldb/source/Plugins/Protocol/MCP/Resource.h 
b/lldb/source/Plugins/Protocol/MCP/Resource.h
index 0c6576602905e..e590936041632 100644
--- a/lldb/source/Plugins/Protocol/MCP/Resource.h
+++ b/lldb/source/Plugins/Protocol/MCP/Resource.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_PLUGINS_PROTOCOL_MCP_RESOURCE_H
-#define LLDB_PLUGINS_PROTOCOL_MCP_RESOURCE_H
+#ifndef LLDB_SOURCE_PLUGINS_PROTOCOL_MCP_RESOURCE_H
+#define LLDB_SOURCE_PLUGINS_PROTOCOL_MCP_RESOURCE_H
 
 #include "lldb/Protocol/MCP/Protocol.h"
 #include "lldb/Protocol/MCP/Resource.h"
diff --git a/lldb/source/Plugins/Protocol/MCP/Tool.h 
b/lldb/source/Plugins/Protocol/MCP/Tool.h
index 8450ce3d6c2dd..198ee2c547961 100644
--- a/lldb/source/Plugins/Protocol/MCP/Tool.h
+++ b/lldb/source/Plugins/Protocol/MCP/Tool.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_PLUGINS_PROTOCOL_MCP_TOOL_H
-#define LLDB_PLUGINS_PROTOCOL_MCP_TOOL_H
+#ifndef LLDB_SOURCE_PLUGINS_PROTOCOL_MCP_TOOL_H
+#define LLDB_SOURCE_PLUGINS_PROTOCOL_MCP_TOOL_H
 
 #include "lldb/Protocol/MCP/Protocol.h"
 #include "lldb/Protocol/MCP/Tool.h"
diff --git a/lldb/source/Plugins/RegisterTypeBuilder/RegisterTypeBuilderClang.h 
b/lldb/source/Plugins/RegisterTypeBuilder/RegisterTypeBuilderClang.h
index a094b22d85c81..611e2e60436ec 100644
--- a/lldb/source/Plugins/RegisterTypeBuilder/RegisterTypeBuilderClang.h
+++ b/lldb/source/Plugins/RegisterTypeBuilder/RegisterTypeBuilderClang.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_PLUGINS_REGISTERTYPEBUILDER_REGISTERTYPEBUILDERCLANG_H
-#define LLDB_PLUGINS_REGISTERTYPEBUILDER_REGISTERTYPEBUILDERCLANG_H
+#ifndef LLDB_SOURCE_PLUGINS_REGISTERTYPEBUILDER_REGISTERTYPEBUILDERCLANG_H
+#define LLDB_SOURCE_PLUGINS_REGISTERTYPEBUILDER_REGISTERTYPEBUILDERCLANG_H
 
 #include "lldb/Target/RegisterTypeBuilder.h"
 #include "lldb/Target/Target.h"
@@ -37,4 +37,4 @@ class RegisterTypeBuilderClang : public RegisterTypeBuilder {
 };
 } // namespace lldb_private
 
-#endif // LLDB_PLUGINS_REGISTERTYPEBUILDER_REGISTERTYPEBUILDERCLANG_H
+#endif // LLDB_SOURCE_PLUGINS_REGISTERTYPEBUILDER_REGISTERTYPEBUILDERCLANG_H
diff --git a/lldb/source/Plugins/ScriptInterpreter/Lua/Lua.h 
b/lldb/source/Plugins/ScriptInterpreter/Lua/Lua.h
index 5daedf835b9b5..908f98164c0f5 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Lua/Lua.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Lua/Lua.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef liblldb_Lua_h_
-#define liblldb_Lua_h_
+#ifndef LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_LUA_LUA_H
+#define LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_LUA_LUA_H
 
 #include "lldb/API/SBBreakpointLocation.h"
 #include "lldb/API/SBFrame.h"
@@ -51,4 +51,4 @@ class Lua {
 
 } // namespace lldb_private
 
-#endif // liblldb_Lua_h_
+#endif // LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_LUA_LUA_H
diff --git a/lldb/source/Plugins/ScriptInterpreter/Lua/SWIGLuaBridge.h 
b/lldb/source/Plugins/ScriptInterpreter/Lua/SWIGLuaBridge.h
index 27263c3b634b6..40f646f9a6357 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Lua/SWIGLuaBridge.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Lua/SWIGLuaBridge.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_PLUGINS_SCRIPTINTERPRETER_LUA_SWIGLUABRIDGE_H
-#define LLDB_PLUGINS_SCRIPTINTERPRETER_LUA_SWIGLUABRIDGE_H
+#ifndef LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_LUA_SWIGLUABRIDGE_H
+#define LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_LUA_SWIGLUABRIDGE_H
 
 #include "lldb/lldb-forward.h"
 #include "lua.hpp"
@@ -32,4 +32,4 @@ class SWIGBridge {
 
 } // namespace lldb_private
 
-#endif // LLDB_PLUGINS_SCRIPTINTERPRETER_LUA_SWIGLUABRIDGE_H
+#endif // LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_LUA_SWIGLUABRIDGE_H
diff --git a/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h 
b/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h
index 7bfbac0ef9d00..7b879713fd3b1 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Lua/ScriptInterpreterLua.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef liblldb_ScriptInterpreterLua_h_
-#define liblldb_ScriptInterpreterLua_h_
+#ifndef LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_LUA_SCRIPTINTERPRETERLUA_H
+#define LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_LUA_SCRIPTINTERPRETERLUA_H
 
 #include <vector>
 
@@ -115,4 +115,4 @@ class ScriptInterpreterLua : public ScriptInterpreter {
 
 } // namespace lldb_private
 
-#endif // liblldb_ScriptInterpreterLua_h_
+#endif // LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_LUA_SCRIPTINTERPRETERLUA_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/OperatingSystemPythonInterface.h
 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/OperatingSystemPythonInterface.h
index 8df48f1b64cc9..cefcc352670a3 100644
--- 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/OperatingSystemPythonInterface.h
+++ 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/OperatingSystemPythonInterface.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_OPERATINGSYSTEMPYTHONINTERFACE_H
-#define 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_OPERATINGSYSTEMPYTHONINTERFACE_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_OPERATINGSYSTEMPYTHONINTERFACE_H
+#define 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_OPERATINGSYSTEMPYTHONINTERFACE_H
 
 #include "lldb/Host/Config.h"
 #include "lldb/Interpreter/Interfaces/OperatingSystemInterface.h"
@@ -60,4 +60,4 @@ class OperatingSystemPythonInterface
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_OPERATINGSYSTEMPYTHONINTERFACE_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_OPERATINGSYSTEMPYTHONINTERFACE_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptInterpreterPythonInterfaces.h
 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptInterpreterPythonInterfaces.h
index b2a347951d0f2..721902ec1e253 100644
--- 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptInterpreterPythonInterfaces.h
+++ 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptInterpreterPythonInterfaces.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHONINTERFACES_H
-#define 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHONINTERFACES_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTINTERPRETERPYTHONINTERFACES_H
+#define 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTINTERPRETERPYTHONINTERFACES_H
 
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/Host/Config.h"
@@ -37,4 +37,4 @@ class ScriptInterpreterPythonInterfaces : public 
PluginInterface {
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHONINTERFACES_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTINTERPRETERPYTHONINTERFACES_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedBreakpointPythonInterface.h
 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedBreakpointPythonInterface.h
index 72da0a195ee01..3da5e7eddc95a 100644
--- 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedBreakpointPythonInterface.h
+++ 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedBreakpointPythonInterface.h
@@ -7,8 +7,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDBREAKPOINTPYTHONINTERFACE_H
-#define 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDBREAKPOINTPYTHONINTERFACE_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDBREAKPOINTPYTHONINTERFACE_H
+#define 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDBREAKPOINTPYTHONINTERFACE_H
 
 #include "lldb/Host/Config.h"
 #include "lldb/Interpreter/Interfaces/ScriptedBreakpointInterface.h"
@@ -56,4 +56,4 @@ class ScriptedBreakpointPythonInterface : public 
ScriptedBreakpointInterface,
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDBREAKPOINTPYTHONINTERFACE_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDBREAKPOINTPYTHONINTERFACE_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedFrameProviderPythonInterface.h
 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedFrameProviderPythonInterface.h
index 884b0355a659e..00be064866639 100644
--- 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedFrameProviderPythonInterface.h
+++ 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedFrameProviderPythonInterface.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDFRAMEPROVIDERPYTHONINTERFACE_H
-#define 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDFRAMEPROVIDERPYTHONINTERFACE_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDFRAMEPROVIDERPYTHONINTERFACE_H
+#define 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDFRAMEPROVIDERPYTHONINTERFACE_H
 
 #include "lldb/Host/Config.h"
 
@@ -62,4 +62,4 @@ class ScriptedFrameProviderPythonInterface
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDFRAMEPROVIDERPYTHONINTERFACE_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDFRAMEPROVIDERPYTHONINTERFACE_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedFramePythonInterface.h
 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedFramePythonInterface.h
index d8ac093106bbd..8aa950f19e6ea 100644
--- 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedFramePythonInterface.h
+++ 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedFramePythonInterface.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDFRAMEPYTHONINTERFACE_H
-#define 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDFRAMEPYTHONINTERFACE_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDFRAMEPYTHONINTERFACE_H
+#define 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDFRAMEPYTHONINTERFACE_H
 
 #include "lldb/Host/Config.h"
 
@@ -62,4 +62,4 @@ class ScriptedFramePythonInterface : public 
ScriptedFrameInterface,
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDFRAMEPYTHONINTERFACE_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDFRAMEPYTHONINTERFACE_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPlatformPythonInterface.h
 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPlatformPythonInterface.h
index a0da1bbc31c70..f214f13e9c1bd 100644
--- 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPlatformPythonInterface.h
+++ 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPlatformPythonInterface.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPLATFORMPYTHONINTERFACE_H
-#define 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPLATFORMPYTHONINTERFACE_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPLATFORMPYTHONINTERFACE_H
+#define 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPLATFORMPYTHONINTERFACE_H
 
 #include "lldb/Host/Config.h"
 #include "lldb/Interpreter/Interfaces/ScriptedPlatformInterface.h"
@@ -61,4 +61,4 @@ class ScriptedPlatformPythonInterface : public 
ScriptedPlatformInterface,
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPLATFORMPYTHONINTERFACE_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPLATFORMPYTHONINTERFACE_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedProcessPythonInterface.h
 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedProcessPythonInterface.h
index 703b942fe5647..18c212c1f3407 100644
--- 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedProcessPythonInterface.h
+++ 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedProcessPythonInterface.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPROCESSPYTHONINTERFACE_H
-#define 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPROCESSPYTHONINTERFACE_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPROCESSPYTHONINTERFACE_H
+#define 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPROCESSPYTHONINTERFACE_H
 
 #include "lldb/Host/Config.h"
 #include "lldb/Interpreter/Interfaces/ScriptedProcessInterface.h"
@@ -88,4 +88,4 @@ class ScriptedProcessPythonInterface : public 
ScriptedProcessInterface,
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPROCESSPYTHONINTERFACE_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPROCESSPYTHONINTERFACE_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPythonInterface.h
 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPythonInterface.h
index 5e3df8f18c2be..4aadee584b2e2 100644
--- 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPythonInterface.h
+++ 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedPythonInterface.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPYTHONINTERFACE_H
-#define 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPYTHONINTERFACE_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPYTHONINTERFACE_H
+#define 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPYTHONINTERFACE_H
 
 #if LLDB_ENABLE_PYTHON
 
@@ -831,4 +831,4 @@ 
ScriptedPythonInterface::ExtractValueFromPythonObject<lldb::ValueObjectListSP>(
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPYTHONINTERFACE_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDPYTHONINTERFACE_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedStopHookPythonInterface.h
 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedStopHookPythonInterface.h
index 7f88098cb7fc7..d36384b369d49 100644
--- 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedStopHookPythonInterface.h
+++ 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedStopHookPythonInterface.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDSTOPHOOKPYTHONINTERFACE_H
-#define 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDSTOPHOOKPYTHONINTERFACE_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDSTOPHOOKPYTHONINTERFACE_H
+#define 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDSTOPHOOKPYTHONINTERFACE_H
 
 #include "lldb/Host/Config.h"
 #include "lldb/Interpreter/Interfaces/ScriptedStopHookInterface.h"
@@ -48,4 +48,4 @@ class ScriptedStopHookPythonInterface : public 
ScriptedStopHookInterface,
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDSTOPHOOKPYTHONINTERFACE_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDSTOPHOOKPYTHONINTERFACE_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedThreadPlanPythonInterface.h
 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedThreadPlanPythonInterface.h
index 2d017396df7e2..1805b896fc03b 100644
--- 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedThreadPlanPythonInterface.h
+++ 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedThreadPlanPythonInterface.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDTHREADPLANPYTHONINTERFACE_H
-#define 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDTHREADPLANPYTHONINTERFACE_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDTHREADPLANPYTHONINTERFACE_H
+#define 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDTHREADPLANPYTHONINTERFACE_H
 
 #include "lldb/Host/Config.h"
 #include "lldb/Interpreter/Interfaces/ScriptedThreadPlanInterface.h"
@@ -58,4 +58,4 @@ class ScriptedThreadPlanPythonInterface : public 
ScriptedThreadPlanInterface,
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDTHREADPLANPYTHONINTERFACE_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDTHREADPLANPYTHONINTERFACE_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedThreadPythonInterface.h
 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedThreadPythonInterface.h
index 043557a827461..e61365d210ba2 100644
--- 
a/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedThreadPythonInterface.h
+++ 
b/lldb/source/Plugins/ScriptInterpreter/Python/Interfaces/ScriptedThreadPythonInterface.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDTHREADPYTHONINTERFACE_H
-#define 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDTHREADPYTHONINTERFACE_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDTHREADPYTHONINTERFACE_H
+#define 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDTHREADPYTHONINTERFACE_H
 
 #include "lldb/Host/Config.h"
 
@@ -60,4 +60,4 @@ class ScriptedThreadPythonInterface : public 
ScriptedThreadInterface,
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // 
LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDTHREADPYTHONINTERFACE_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_INTERFACES_SCRIPTEDTHREADPYTHONINTERFACE_H
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h 
b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h
index 45bb499248329..71238cc4ad213 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h
@@ -44,9 +44,8 @@
 //   nonnull, and use optionals where necessary.
 //
 
-
-#ifndef LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_PYTHONDATAOBJECTS_H
-#define LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_PYTHONDATAOBJECTS_H
+#ifndef LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_PYTHONDATAOBJECTS_H
+#define LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_PYTHONDATAOBJECTS_H
 
 #include "lldb/Host/Config.h"
 
@@ -782,4 +781,4 @@ int RunSimpleString(const char *str);
 
 #endif
 
-#endif // LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_PYTHONDATAOBJECTS_H
+#endif // LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_PYTHONDATAOBJECTS_H
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/PythonReadline.h 
b/lldb/source/Plugins/ScriptInterpreter/Python/PythonReadline.h
index c75219eb1a4f9..c9976e79c9d9e 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/PythonReadline.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/PythonReadline.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_PYTHONREADLINE_H
-#define LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_PYTHONREADLINE_H
+#ifndef LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_PYTHONREADLINE_H
+#define LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_PYTHONREADLINE_H
 
 #include "lldb/Host/Config.h"
 
@@ -25,4 +25,4 @@ PyMODINIT_FUNC initlldb_readline(void);
 
 #endif
 
-#endif // LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_PYTHONREADLINE_H
+#endif // LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_PYTHONREADLINE_H
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/SWIGPythonBridge.h 
b/lldb/source/Plugins/ScriptInterpreter/Python/SWIGPythonBridge.h
index 9f68445d0d72b..7a64d8e91e62c 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/SWIGPythonBridge.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/SWIGPythonBridge.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SWIGPYTHONBRIDGE_H
-#define LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SWIGPYTHONBRIDGE_H
+#ifndef LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_SWIGPYTHONBRIDGE_H
+#define LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_SWIGPYTHONBRIDGE_H
 
 #include <optional>
 #include <string>
@@ -278,4 +278,4 @@ void *LLDBSWIGPython_CastPyObjectToSBFrameList(PyObject 
*data);
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SWIGPYTHONBRIDGE_H
+#endif // LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_SWIGPYTHONBRIDGE_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h 
b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h
index 2e8301a85eb6c..4a56278e3df1a 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHON_H
-#define LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHON_H
+#ifndef LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHON_H
+#define LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHON_H
 
 #include "lldb/Host/Config.h"
 
@@ -60,4 +60,4 @@ class ScriptInterpreterPython : public ScriptInterpreter,
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHON_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHON_H
diff --git 
a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h 
b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h
index ad2ddd2219e8a..1eac78e6360f2 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPythonImpl.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHONIMPL_H
-#define LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHONIMPL_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHONIMPL_H
+#define 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHONIMPL_H
 
 #include "lldb/Host/Config.h"
 
@@ -499,4 +499,4 @@ class IOHandlerPythonInterpreter : public IOHandler {
 } // namespace lldb_private
 
 #endif // LLDB_ENABLE_PYTHON
-#endif // LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHONIMPL_H
+#endif // 
LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_SCRIPTINTERPRETERPYTHONIMPL_H
diff --git a/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h 
b/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h
index 0c281793613a5..c335e6dc6de36 100644
--- a/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h
+++ b/lldb/source/Plugins/ScriptInterpreter/Python/lldb-python.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_LLDB_PYTHON_H
-#define LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_LLDB_PYTHON_H
+#ifndef LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_LLDB_PYTHON_H
+#define LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_LLDB_PYTHON_H
 
 // BEGIN FIXME
 // This declaration works around a clang module build failure.
@@ -68,4 +68,4 @@ static_assert(PY_VERSION_HEX >= LLDB_MINIMUM_PYTHON_VERSION,
 #endif
 #endif
 
-#endif // LLDB_PLUGINS_SCRIPTINTERPRETER_PYTHON_LLDB_PYTHON_H
+#endif // LLDB_SOURCE_PLUGINS_SCRIPTINTERPRETER_PYTHON_LLDB_PYTHON_H
diff --git 
a/lldb/source/Plugins/SyntheticFrameProvider/ScriptedFrameProvider/ScriptedFrameProvider.h
 
b/lldb/source/Plugins/SyntheticFrameProvider/ScriptedFrameProvider/ScriptedFrameProvider.h
index 6937f9acbc9a9..6edbcb1b692a1 100644
--- 
a/lldb/source/Plugins/SyntheticFrameProvider/ScriptedFrameProvider/ScriptedFrameProvider.h
+++ 
b/lldb/source/Plugins/SyntheticFrameProvider/ScriptedFrameProvider/ScriptedFrameProvider.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef 
LLDB_PLUGINS_SYNTHETICFRAMEPROVIDER_SCRIPTEDFRAMEPROVIDER_SCRIPTEDFRAMEPROVIDER_H
-#define 
LLDB_PLUGINS_SYNTHETICFRAMEPROVIDER_SCRIPTEDFRAMEPROVIDER_SCRIPTEDFRAMEPROVIDER_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SYNTHETICFRAMEPROVIDER_SCRIPTEDFRAMEPROVIDER_SCRIPTEDFRAMEPROVIDER_H
+#define 
LLDB_SOURCE_PLUGINS_SYNTHETICFRAMEPROVIDER_SCRIPTEDFRAMEPROVIDER_SCRIPTEDFRAMEPROVIDER_H
 
 #include "lldb/Target/SyntheticFrameProvider.h"
 #include "lldb/Utility/ScriptedMetadata.h"
@@ -52,4 +52,4 @@ class ScriptedFrameProvider : public SyntheticFrameProvider {
 
 } // namespace lldb_private
 
-#endif // 
LLDB_PLUGINS_SYNTHETICFRAMEPROVIDER_SCRIPTEDFRAMEPROVIDER_SCRIPTEDFRAMEPROVIDER_H
+#endif // 
LLDB_SOURCE_PLUGINS_SYNTHETICFRAMEPROVIDER_SCRIPTEDFRAMEPROVIDER_SCRIPTEDFRAMEPROVIDER_H
diff --git 
a/lldb/source/Plugins/SystemRuntime/MacOSX/AbortWithPayloadFrameRecognizer.h 
b/lldb/source/Plugins/SystemRuntime/MacOSX/AbortWithPayloadFrameRecognizer.h
index 6f3538647aadf..e9fb91abe4ea1 100644
--- a/lldb/source/Plugins/SystemRuntime/MacOSX/AbortWithPayloadFrameRecognizer.h
+++ b/lldb/source/Plugins/SystemRuntime/MacOSX/AbortWithPayloadFrameRecognizer.h
@@ -5,8 +5,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 
//===----------------------------------------------------------------------===//
-#ifndef LLDB_MACOSX_ABORTWITHPAYLOADFRAMERECOGNIZER_H
-#define LLDB_MACOSX_ABORTWITHPAYLOADFRAMERECOGNIZER_H
+#ifndef 
LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_ABORTWITHPAYLOADFRAMERECOGNIZER_H
+#define 
LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_ABORTWITHPAYLOADFRAMERECOGNIZER_H
 
 #include "lldb/Target/Process.h"
 #include "lldb/Target/StackFrameRecognizer.h"
@@ -35,4 +35,4 @@ class AbortWithPayloadFrameRecognizer : public 
StackFrameRecognizer {
 };
 } // namespace lldb_private
 
-#endif // LLDB_MACOSX_ABORTWITHPAYLOADFRAMERECOGNIZER_H
+#endif // 
LLDB_SOURCE_PLUGINS_SYSTEMRUNTIME_MACOSX_ABORTWITHPAYLOADFRAMERECOGNIZER_H
diff --git a/lldb/source/Plugins/Trace/common/ThreadPostMortemTrace.h 
b/lldb/source/Plugins/Trace/common/ThreadPostMortemTrace.h
index 39f53fe09f886..e3ce2a8312927 100644
--- a/lldb/source/Plugins/Trace/common/ThreadPostMortemTrace.h
+++ b/lldb/source/Plugins/Trace/common/ThreadPostMortemTrace.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_TARGET_THREADPOSTMORTEMTRACE_H
-#define LLDB_TARGET_THREADPOSTMORTEMTRACE_H
+#ifndef LLDB_SOURCE_PLUGINS_TRACE_COMMON_THREADPOSTMORTEMTRACE_H
+#define LLDB_SOURCE_PLUGINS_TRACE_COMMON_THREADPOSTMORTEMTRACE_H
 
 #include "lldb/Target/Thread.h"
 #include <optional>
@@ -56,4 +56,4 @@ class ThreadPostMortemTrace : public Thread {
 
 } // namespace lldb_private
 
-#endif // LLDB_TARGET_THREADPOSTMORTEMTRACE_H
+#endif // LLDB_SOURCE_PLUGINS_TRACE_COMMON_THREADPOSTMORTEMTRACE_H
diff --git a/lldb/source/Plugins/TraceExporter/common/TraceHTR.h 
b/lldb/source/Plugins/TraceExporter/common/TraceHTR.h
index 6c3a236814234..4ef3ff295cc09 100644
--- a/lldb/source/Plugins/TraceExporter/common/TraceHTR.h
+++ b/lldb/source/Plugins/TraceExporter/common/TraceHTR.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_TARGET_TRACE_HTR_H
-#define LLDB_TARGET_TRACE_HTR_H
+#ifndef LLDB_SOURCE_PLUGINS_TRACEEXPORTER_COMMON_TRACEHTR_H
+#define LLDB_SOURCE_PLUGINS_TRACEEXPORTER_COMMON_TRACEHTR_H
 
 #include "lldb/Target/Thread.h"
 #include "lldb/Target/Trace.h"
@@ -406,4 +406,4 @@ HTRBlockLayerUP BasicSuperBlockMerge(IHTRLayer &layer);
 
 } // namespace lldb_private
 
-#endif // LLDB_TARGET_TRACE_HTR_H
+#endif // LLDB_SOURCE_PLUGINS_TRACEEXPORTER_COMMON_TRACEHTR_H
diff --git 
a/lldb/source/Plugins/TraceExporter/ctf/CommandObjectThreadTraceExportCTF.h 
b/lldb/source/Plugins/TraceExporter/ctf/CommandObjectThreadTraceExportCTF.h
index 06834edf14ea1..09dcc68f88fff 100644
--- a/lldb/source/Plugins/TraceExporter/ctf/CommandObjectThreadTraceExportCTF.h
+++ b/lldb/source/Plugins/TraceExporter/ctf/CommandObjectThreadTraceExportCTF.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_TRACE_INTEL_PT_COMMANDOBJECTTHREADTRACEEXPORTCTF_H
-#define LLDB_SOURCE_PLUGINS_TRACE_INTEL_PT_COMMANDOBJECTTHREADTRACEEXPORTCTF_H
+#ifndef 
LLDB_SOURCE_PLUGINS_TRACEEXPORTER_CTF_COMMANDOBJECTTHREADTRACEEXPORTCTF_H
+#define 
LLDB_SOURCE_PLUGINS_TRACEEXPORTER_CTF_COMMANDOBJECTTHREADTRACEEXPORTCTF_H
 
 #include "TraceExporterCTF.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
@@ -56,4 +56,4 @@ class CommandObjectThreadTraceExportCTF : public 
CommandObjectParsed {
 } // namespace ctf
 } // namespace lldb_private
 
-#endif // 
LLDB_SOURCE_PLUGINS_TRACE_INTEL_PT_COMMANDOBJECTTHREADTRACEEXPORTCTF_H
+#endif // 
LLDB_SOURCE_PLUGINS_TRACEEXPORTER_CTF_COMMANDOBJECTTHREADTRACEEXPORTCTF_H
diff --git a/lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.h 
b/lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.h
index 74f14fc354d1d..11ce63e9fcf88 100644
--- a/lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.h
+++ b/lldb/source/Plugins/TraceExporter/ctf/TraceExporterCTF.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_PLUGINS_TRACE_EXPORTER_CTF_H
-#define LLDB_SOURCE_PLUGINS_TRACE_EXPORTER_CTF_H
+#ifndef LLDB_SOURCE_PLUGINS_TRACEEXPORTER_CTF_TRACEEXPORTERCTF_H
+#define LLDB_SOURCE_PLUGINS_TRACEEXPORTER_CTF_TRACEEXPORTERCTF_H
 
 #include "lldb/Target/TraceExporter.h"
 
@@ -39,4 +39,4 @@ class TraceExporterCTF : public TraceExporter {
 } // namespace ctf
 } // namespace lldb_private
 
-#endif // LLDB_SOURCE_PLUGINS_TRACE_EXPORTER_CTF_H
+#endif // LLDB_SOURCE_PLUGINS_TRACEEXPORTER_CTF_TRACEEXPORTERCTF_H
diff --git a/lldb/source/Utility/WasmVirtualRegisters.h 
b/lldb/source/Utility/WasmVirtualRegisters.h
index 404a5ae35dc91..65ba85cc979c6 100644
--- a/lldb/source/Utility/WasmVirtualRegisters.h
+++ b/lldb/source/Utility/WasmVirtualRegisters.h
@@ -6,8 +6,8 @@
 //
 
//===----------------------------------------------------------------------===//
 
-#ifndef LLDB_SOURCE_UTILITY_WASM_VIRTUAL_REGISTERS_H
-#define LLDB_SOURCE_UTILITY_WASM_VIRTUAL_REGISTERS_H
+#ifndef LLDB_SOURCE_UTILITY_WASMVIRTUALREGISTERS_H
+#define LLDB_SOURCE_UTILITY_WASMVIRTUALREGISTERS_H
 
 #include "lldb/lldb-private.h"
 

_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Reply via email to