diff --git a/extension/llm/custom_ops/op_sdpa.cpp b/extension/llm/custom_ops/op_sdpa.cpp
index 8afec156d53..50fa9338338 100644
--- a/extension/llm/custom_ops/op_sdpa.cpp
+++ b/extension/llm/custom_ops/op_sdpa.cpp
@@ -16,7 +16,6 @@
 #include <executorch/runtime/core/exec_aten/util/scalar_type_util.h>
 
 #include <array>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <vector>
 
 #ifdef ET_USE_THREADPOOL
diff --git a/extension/llm/runner/image.h b/extension/llm/runner/image.h
index d3c4e8d945d..67fb8939518 100644
--- a/extension/llm/runner/image.h
+++ b/extension/llm/runner/image.h
@@ -9,9 +9,8 @@
 // A simple image struct.
 
 #pragma once
-#include <cstdint>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <executorch/runtime/platform/compiler.h>
+#include <cstdint>
 #include <vector>
 
 namespace executorch {
diff --git a/extension/llm/runner/multimodal_runner.h b/extension/llm/runner/multimodal_runner.h
index 1af9cb6fa29..94539c65cc6 100644
--- a/extension/llm/runner/multimodal_runner.h
+++ b/extension/llm/runner/multimodal_runner.h
@@ -13,13 +13,10 @@
 #pragma once
 
 #include <cstdint>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <functional>
 #include <memory>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <string>
 #include <type_traits>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <unordered_map>
 
 #include <executorch/extension/llm/runner/image.h>
diff --git a/extension/llm/runner/stats.h b/extension/llm/runner/stats.h
index f9462d24cd0..79c5781e337 100644
--- a/extension/llm/runner/stats.h
+++ b/extension/llm/runner/stats.h
@@ -12,7 +12,6 @@
 #include <executorch/runtime/platform/log.h>
 #include <cinttypes>
 #include <sstream>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <string>
 
 namespace executorch {
diff --git a/extension/llm/runner/text_decoder_runner.h b/extension/llm/runner/text_decoder_runner.h
index c6f8a0ca676..ca4d127e516 100644
--- a/extension/llm/runner/text_decoder_runner.h
+++ b/extension/llm/runner/text_decoder_runner.h
@@ -14,7 +14,6 @@
 #include <executorch/extension/module/module.h>
 #include <executorch/extension/tensor/tensor.h>
 #include <executorch/runtime/platform/compiler.h>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <functional>
 
 namespace executorch {
diff --git a/extension/llm/runner/text_prefiller.h b/extension/llm/runner/text_prefiller.h
index 9dbaec40e63..2f1d5ae2b75 100644
--- a/extension/llm/runner/text_prefiller.h
+++ b/extension/llm/runner/text_prefiller.h
@@ -13,7 +13,6 @@
 
 #include <executorch/extension/llm/runner/text_decoder_runner.h>
 #include <executorch/extension/llm/tokenizer/tokenizer.h>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <functional>
 
 namespace executorch {
diff --git a/extension/llm/tokenizer/tokenizer.h b/extension/llm/tokenizer/tokenizer.h
index 52983d90753..c987857a305 100644
--- a/extension/llm/tokenizer/tokenizer.h
+++ b/extension/llm/tokenizer/tokenizer.h
@@ -9,9 +9,7 @@
 #pragma once
 
 #include <cinttypes>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <string>
-// patternlint-disable-next-line executorch-cpp-nostdinc
 #include <vector>
 
 #include <executorch/runtime/core/error.h>
diff --git a/extension/parallel/thread_parallel.h b/extension/parallel/thread_parallel.h
index bbce211597d..8b174075ae9 100644
--- a/extension/parallel/thread_parallel.h
+++ b/extension/parallel/thread_parallel.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include <cstdint>
-// @nolint PATTERNLINT Ok to use stdlib for this optional library
 #include <functional>
 
 namespace executorch {
diff --git a/kernels/optimized/vec/vec_base.h b/kernels/optimized/vec/vec_base.h
index 4a386f9e8ce..5ff4327e6f5 100644
--- a/kernels/optimized/vec/vec_base.h
+++ b/kernels/optimized/vec/vec_base.h
@@ -1,7 +1,5 @@
 #pragma once
 
-// @nolint PATTERNLINT <functional> is required for std::equal_to, etc.
-
 #include <cassert>
 #include <cstdint>
 #include <cstring>
diff --git a/runtime/core/exec_aten/testing_util/tensor_factory.h b/runtime/core/exec_aten/testing_util/tensor_factory.h
index 2ea21e95839..9f8f7e9db75 100644
--- a/runtime/core/exec_aten/testing_util/tensor_factory.h
+++ b/runtime/core/exec_aten/testing_util/tensor_factory.h
@@ -14,10 +14,8 @@
 #ifdef USE_ATEN_LIB
 #include <ATen/ATen.h>
 #else // !USE_ATEN_LIB
-#include <numeric>
-// @nolint PATTERNLINT Ok to use stdlib for this test framework
 #include <memory>
-// @nolint PATTERNLINT Ok to use stdlib for this test framework
+#include <numeric>
 #include <vector>
 #endif // !USE_ATEN_LIB