diff --git a/src/dawn/native/vulkan/ShaderModuleVk.h b/src/dawn/native/vulkan/ShaderModuleVk.h
index bd1c686..424aab6 100644
--- a/src/dawn/native/vulkan/ShaderModuleVk.h
+++ b/src/dawn/native/vulkan/ShaderModuleVk.h
@@ -17,8 +17,7 @@
 
 #include <memory>
 #include <mutex>
-// TODO(https://crbug.com/dawn/1379) Update cpplint and remove NOLINT
-#include <optional>  // NOLINT(build/include_order))
+#include <optional>
 #include <unordered_map>
 #include <utility>
 #include <vector>
diff --git a/src/dawn/node/interop/Core.h b/src/dawn/node/interop/Core.h
index 4bf9ee7..be1b4ac 100644
--- a/src/dawn/node/interop/Core.h
+++ b/src/dawn/node/interop/Core.h
@@ -20,14 +20,12 @@
 
 #include <cstdint>
 #include <limits>
-// TODO(https://crbug.com/dawn/1379) Update cpplint and remove NOLINT
-#include <optional>  // NOLINT(build/include_order)
+#include <optional>
 #include <string>
 #include <type_traits>
 #include <unordered_map>
 #include <utility>
-// TODO(https://crbug.com/dawn/1379) Update cpplint and remove NOLINT
-#include <variant>  // NOLINT(build/include_order)
+#include <variant>
 #include <vector>
 
 #include "src/dawn/node/interop/Napi.h"
diff --git a/src/dawn/node/utils/Debug.h b/src/dawn/node/utils/Debug.h
index c68b858..66cd4da 100644
--- a/src/dawn/node/utils/Debug.h
+++ b/src/dawn/node/utils/Debug.h
@@ -16,13 +16,11 @@
 #define SRC_DAWN_NODE_UTILS_DEBUG_H_
 
 #include <iostream>
-// TODO(https://crbug.com/dawn/1379) Update cpplint and remove NOLINT
-#include <optional>  // NOLINT(build/include_order)
+#include <optional>
 #include <sstream>
 #include <unordered_map>
 #include <utility>
-// TODO(https://crbug.com/dawn/1379) Update cpplint and remove NOLINT
-#include <variant>  // NOLINT(build/include_order)
+#include <variant>
 #include <vector>
 
 #include "dawn/webgpu_cpp_print.h"
diff --git a/src/tint/bench/benchmark.h b/src/tint/bench/benchmark.h
index 733b1a7..d52a0d6 100644
--- a/src/tint/bench/benchmark.h
+++ b/src/tint/bench/benchmark.h
@@ -17,8 +17,7 @@
 
 #include <memory>
 #include <string>
-// TODO(https://crbug.com/dawn/1379) Update cpplint and remove NOLINT
-#include <variant>  // NOLINT: Found C system header after C++ system header.
+#include <variant>
 
 #include "benchmark/benchmark.h"
 #include "src/tint/utils/concat.h"
diff --git a/src/tint/cmd/main.cc b/src/tint/cmd/main.cc
index 438e4a2..f6029ac 100644
--- a/src/tint/cmd/main.cc
+++ b/src/tint/cmd/main.cc
@@ -17,7 +17,7 @@
 #include <iostream>
 #include <limits>
 #include <memory>
-#include <optional>  // NOLINT(build/include_order)
+#include <optional>
 #include <sstream>
 #include <string>
 #include <vector>
diff --git a/src/tint/number.h b/src/tint/number.h
index 7a0b13b..7f0c2f1 100644
--- a/src/tint/number.h
+++ b/src/tint/number.h
@@ -18,9 +18,8 @@
 #include <stdint.h>
 #include <functional>
 #include <limits>
+#include <optional>
 #include <ostream>
-// TODO(https://crbug.com/dawn/1379) Update cpplint and remove NOLINT
-#include <optional>  // NOLINT(build/include_order))
 
 #include "src/tint/utils/compiler_macros.h"
 #include "src/tint/utils/result.h"
diff --git a/src/tint/reader/wgsl/lexer.cc b/src/tint/reader/wgsl/lexer.cc
index e2b016b..716075e 100644
--- a/src/tint/reader/wgsl/lexer.cc
+++ b/src/tint/reader/wgsl/lexer.cc
@@ -19,7 +19,7 @@
 #include <cstring>
 #include <functional>
 #include <limits>
-#include <optional>  // NOLINT(build/include_order)
+#include <optional>
 #include <tuple>
 #include <type_traits>
 #include <utility>
diff --git a/src/tint/reader/wgsl/token.h b/src/tint/reader/wgsl/token.h
index 30c2edf..2fcf742 100644
--- a/src/tint/reader/wgsl/token.h
+++ b/src/tint/reader/wgsl/token.h
@@ -17,8 +17,7 @@
 
 #include <string>
 #include <string_view>
-// TODO(https://crbug.com/dawn/1379) Update cpplint and remove NOLINT
-#include <variant>  // NOLINT(build/include_order))
+#include <variant>
 
 #include "src/tint/source.h"
 
diff --git a/src/tint/resolver/resolver_constants.cc b/src/tint/resolver/resolver_constants.cc
index b281f91..24c57d4 100644
--- a/src/tint/resolver/resolver_constants.cc
+++ b/src/tint/resolver/resolver_constants.cc
@@ -15,8 +15,7 @@
 #include "src/tint/resolver/resolver.h"
 
 #include <cmath>
-// TODO(https://crbug.com/dawn/1379) Update cpplint and remove NOLINT
-#include <optional>  // NOLINT(build/include_order))
+#include <optional>
 
 #include "src/tint/sem/abstract_float.h"
 #include "src/tint/sem/abstract_int.h"
diff --git a/src/tint/sem/constant.h b/src/tint/sem/constant.h
index c0ba9e6..4f7132a 100644
--- a/src/tint/sem/constant.h
+++ b/src/tint/sem/constant.h
@@ -16,9 +16,8 @@
 #define SRC_TINT_SEM_CONSTANT_H_
 
 #include <ostream>
-// TODO(https://crbug.com/dawn/1379) Update cpplint and remove NOLINT
 #include <utility>
-#include <variant>  // NOLINT(build/include_order)
+#include <variant>
 #include <vector>
 
 #include "src/tint/program_builder.h"
diff --git a/src/tint/transform/num_workgroups_from_uniform.h b/src/tint/transform/num_workgroups_from_uniform.h
index 9f0b6c1..0111ccc 100644
--- a/src/tint/transform/num_workgroups_from_uniform.h
+++ b/src/tint/transform/num_workgroups_from_uniform.h
@@ -15,7 +15,7 @@
 #ifndef SRC_TINT_TRANSFORM_NUM_WORKGROUPS_FROM_UNIFORM_H_
 #define SRC_TINT_TRANSFORM_NUM_WORKGROUPS_FROM_UNIFORM_H_
 
-#include <optional>  // NOLINT(build/include_order)
+#include <optional>
 
 #include "src/tint/sem/binding_point.h"
 #include "src/tint/transform/transform.h"
diff --git a/src/tint/utils/result.h b/src/tint/utils/result.h
index b2a69d5..6cfe668 100644
--- a/src/tint/utils/result.h
+++ b/src/tint/utils/result.h
@@ -16,8 +16,7 @@
 #define SRC_TINT_UTILS_RESULT_H_
 
 #include <ostream>
-// TODO(https://crbug.com/dawn/1379) Update cpplint and remove NOLINT
-#include <variant>  // NOLINT(build/include_order)
+#include <variant>
 
 namespace tint::utils {
 
diff --git a/src/tint/writer/hlsl/generator.h b/src/tint/writer/hlsl/generator.h
index a18687a..233416e 100644
--- a/src/tint/writer/hlsl/generator.h
+++ b/src/tint/writer/hlsl/generator.h
@@ -16,7 +16,7 @@
 #define SRC_TINT_WRITER_HLSL_GENERATOR_H_
 
 #include <memory>
-#include <optional>  // NOLINT(build/include_order)
+#include <optional>
 #include <string>
 #include <unordered_set>
 #include <utility>
diff --git a/src/tint/writer/spirv/operand.h b/src/tint/writer/spirv/operand.h
index 3174d0c..dab10e9 100644
--- a/src/tint/writer/spirv/operand.h
+++ b/src/tint/writer/spirv/operand.h
@@ -17,8 +17,7 @@
 
 #include <cstring>
 #include <string>
-// TODO(https://crbug.com/dawn/1379) Update cpplint and remove NOLINT
-#include <variant>  // NOLINT(build/include_order)
+#include <variant>
 #include <vector>
 
 #include "src/tint/utils/hash.h"
diff --git a/tools/src/cmd/remote-compile/main.cc b/tools/src/cmd/remote-compile/main.cc
index d6f62e7..24dc0b5 100644
--- a/tools/src/cmd/remote-compile/main.cc
+++ b/tools/src/cmd/remote-compile/main.cc
@@ -17,11 +17,10 @@
 #include <fstream>
 #include <sstream>
 #include <string>
+#include <thread>
 #include <type_traits>
 #include <vector>
 
-#include <thread>  // NOLINT
-
 #include "tools/src/cmd/remote-compile/compile.h"
 #include "tools/src/cmd/remote-compile/socket.h"
 
diff --git a/tools/src/cmd/remote-compile/rwmutex.h b/tools/src/cmd/remote-compile/rwmutex.h
index ea55209..803cd89 100644
--- a/tools/src/cmd/remote-compile/rwmutex.h
+++ b/tools/src/cmd/remote-compile/rwmutex.h
@@ -15,8 +15,8 @@
 #ifndef TOOLS_SRC_CMD_REMOTE_COMPILE_RWMUTEX_H_
 #define TOOLS_SRC_CMD_REMOTE_COMPILE_RWMUTEX_H_
 
-#include <condition_variable>  // NOLINT
-#include <mutex>               // NOLINT
+#include <condition_variable>
+#include <mutex>
 
 ////////////////////////////////////////////////////////////////////////////////
 // RWMutex