[clang] [llvm] [ADT][NFC] Remove unused includes in DenseMap/DenseSet headers (PR #207282)

[Marc Auberer via cfe-commits]

https://github.com/marcauberer updated https://github.com/llvm/llvm-project/pull/207282

>From caf74cadc19980b48ab207c7deeb90d07e44619f Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer at chillibits.com>
Date: Thu, 2 Jul 2026 23:23:46 +0200
Subject: [PATCH 1/3] [ADT][NFC] Remove unused includes in DenseMap/DenseSet
 headers

---
 llvm/include/llvm/ADT/DenseMap.h | 2 --
 llvm/include/llvm/ADT/DenseSet.h | 1 -
 llvm/include/llvm/Support/JSON.h | 1 +
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/llvm/include/llvm/ADT/DenseMap.h b/llvm/include/llvm/ADT/DenseMap.h
index 9d45ef0cee3da..1480031c8d7da 100644
--- a/llvm/include/llvm/ADT/DenseMap.h
+++ b/llvm/include/llvm/ADT/DenseMap.h
@@ -26,7 +26,6 @@
 #include "llvm/ADT/EpochTracker.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/STLForwardCompat.h"
-#include "llvm/Support/AlignOf.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/MemAlloc.h"
@@ -35,7 +34,6 @@
 #include <algorithm>
 #include <cassert>
 #include <cstddef>
-#include <cstdint>
 #include <cstring>
 #include <initializer_list>
 #include <iterator>
diff --git a/llvm/include/llvm/ADT/DenseSet.h b/llvm/include/llvm/ADT/DenseSet.h
index 645d6d1568f35..3dca8f64d1717 100644
--- a/llvm/include/llvm/ADT/DenseSet.h
+++ b/llvm/include/llvm/ADT/DenseSet.h
@@ -20,7 +20,6 @@
 #include "llvm/ADT/STLForwardCompat.h"
 #include "llvm/Support/MathExtras.h"
 #include "llvm/Support/type_traits.h"
-#include <cstddef>
 #include <initializer_list>
 #include <iterator>
 #include <utility>
diff --git a/llvm/include/llvm/Support/JSON.h b/llvm/include/llvm/Support/JSON.h
index b28754f8b7b22..3b145a69c74cb 100644
--- a/llvm/include/llvm/Support/JSON.h
+++ b/llvm/include/llvm/Support/JSON.h
@@ -50,6 +50,7 @@
 #include "llvm/ADT/STLFunctionalExtras.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/StringRef.h"
+#include "llvm/Support/AlignOf.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/FormatVariadic.h"
 #include "llvm/Support/raw_ostream.h"

>From c970a16677802bfe1e10d90d118eeb300918466e Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer at chillibits.com>
Date: Thu, 2 Jul 2026 23:57:42 +0200
Subject: [PATCH 2/3] Also remove unused includes in DenseMapInfo.h

---
 llvm/include/llvm/ADT/DenseMapInfo.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/llvm/include/llvm/ADT/DenseMapInfo.h b/llvm/include/llvm/ADT/DenseMapInfo.h
index 19850bcb81270..3a3dfa9a185b1 100644
--- a/llvm/include/llvm/ADT/DenseMapInfo.h
+++ b/llvm/include/llvm/ADT/DenseMapInfo.h
@@ -14,10 +14,8 @@
 #ifndef LLVM_ADT_DENSEMAPINFO_H
 #define LLVM_ADT_DENSEMAPINFO_H
 
-#include <cassert>
 #include <cstddef>
 #include <cstdint>
-#include <limits>
 #include <optional>
 #include <tuple>
 #include <type_traits>

>From 202024258511964ec20c688e4761343e303cd79e Mon Sep 17 00:00:00 2001
From: Marc Auberer <marc.auberer at sap.com>
Date: Fri, 3 Jul 2026 12:06:09 +0000
Subject: [PATCH 3/3] Fix another transitive include

---
 clang/include/clang/Basic/TokenKinds.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/clang/include/clang/Basic/TokenKinds.h b/clang/include/clang/Basic/TokenKinds.h
index e5e7efb4d4387..5a2d673a9995b 100644
--- a/clang/include/clang/Basic/TokenKinds.h
+++ b/clang/include/clang/Basic/TokenKinds.h
@@ -17,6 +17,8 @@
 #include "llvm/ADT/DenseMapInfo.h"
 #include "llvm/Support/Compiler.h"
 
+#include <cassert>
+
 namespace clang {
 
 namespace tok {