[Lldb-commits] [lldb] lldb: Linux: clean up dead and mis-ordered includes (PR #217435)

[Nick Desaulniers via lldb-commits]

https://github.com/nickdesaulniers created https://github.com/llvm/llvm-project/pull/217435

Add a few obviously missing includes. Use fully qualified paths more
consistently.

This will help later planned refactorings, and better complies with the
style guide.

Link: https://llvm.org/docs/CodingStandards.html#include-style
Link: https://github.com/llvm/llvm-project/issues/217413


>From 2c1d46695fb54ff6a83edeb9d4896e28b23a659c Mon Sep 17 00:00:00 2001
From: Nick Desaulniers <ndesaulniers at google.com>
Date: Wed, 19 Aug 2026 11:20:44 -0700
Subject: [PATCH] lldb: Linux: clean up dead and mis-ordered includes

Add a few obviously missing includes. Use fully qualified paths more
consistently.

This will help later planned refactorings, and better complies with the
style guide.

Link: https://llvm.org/docs/CodingStandards.html#include-style
Link: https://github.com/llvm/llvm-project/issues/217413
---
 .../Process/Linux/NativeProcessLinux.cpp      | 21 +++++++------------
 .../Plugins/Process/Linux/SingleStepCheck.cpp | 15 +++++++------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
index d15907d7cedb7..c99b4f7029c7f 100644
--- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
+++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
@@ -8,22 +8,10 @@
 
 #include "NativeProcessLinux.h"
 
-#include <cerrno>
-#include <cstdint>
-#include <cstring>
-#include <unistd.h>
-
-#include <fstream>
-#include <mutex>
-#include <optional>
-#include <sstream>
-#include <string>
-#include <unordered_map>
-
-#include "NativeThreadLinux.h"
+#include "Plugins/Process/Linux/NativeThreadLinux.h"
+#include "Plugins/Process/Linux/Procfs.h"
 #include "Plugins/Process/POSIX/ProcessPOSIXLog.h"
 #include "Plugins/Process/Utility/LinuxProcMaps.h"
-#include "Procfs.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Host/HostProcess.h"
@@ -49,12 +37,17 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Threading.h"
 
+#include <cerrno>
+#include <cstdint>
+#include <cstring>
 #include <linux/unistd.h>
+#include <optional>
 #include <sys/socket.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
 #include <sys/user.h>
 #include <sys/wait.h>
+#include <unistd.h>
 
 #ifdef __aarch64__
 #include <asm/hwcap.h>
diff --git a/lldb/source/Plugins/Process/Linux/SingleStepCheck.cpp b/lldb/source/Plugins/Process/Linux/SingleStepCheck.cpp
index e7124ef8e5498..7f08830c87c03 100644
--- a/lldb/source/Plugins/Process/Linux/SingleStepCheck.cpp
+++ b/lldb/source/Plugins/Process/Linux/SingleStepCheck.cpp
@@ -8,19 +8,18 @@
 
 #include "SingleStepCheck.h"
 
+#include "Plugins/Process/Linux/NativeProcessLinux.h"
+#include "Plugins/Process/POSIX/ProcessPOSIXLog.h"
+#include "lldb/Host/linux/Ptrace.h"
+#include "lldb/Utility/Status.h"
+#include "llvm/Support/Compiler.h"
+#include "llvm/Support/Errno.h"
+
 #include <csignal>
 #include <sched.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "NativeProcessLinux.h"
-
-#include "llvm/Support/Compiler.h"
-#include "llvm/Support/Errno.h"
-
-#include "Plugins/Process/POSIX/ProcessPOSIXLog.h"
-#include "lldb/Host/linux/Ptrace.h"
-#include "lldb/Utility/Status.h"
 
 using namespace lldb;
 using namespace lldb_private;