5 files changed, 8 insertions, 10 deletions
diff --git a/absl/types/BUILD.bazel b/absl/types/BUILD.bazel
index 8d09440ef104..f1e432d19a15 100644
--- a/absl/types/BUILD.bazel
+++ b/absl/types/BUILD.bazel
@@ -48,7 +48,7 @@ cc_library(
     hdrs = ["bad_any_cast.h"],
     copts = ABSL_EXCEPTIONS_FLAG + ABSL_DEFAULT_COPTS,
     features = [
-        "-use_header_modules",  # b/33207452
+        "-use_header_modules",
     ],
     deps = [
         "//absl/base",
@@ -153,7 +153,7 @@ cc_library(
     hdrs = ["bad_optional_access.h"],
     copts = ABSL_DEFAULT_COPTS + ABSL_EXCEPTIONS_FLAG,
     features = [
-        "-use_header_modules",  # b/33207452
+        "-use_header_modules",
     ],
     deps = [
         "//absl/base",
diff --git a/absl/types/any_test.cc b/absl/types/any_test.cc
index ab04bf5aac60..aef98f308241 100644
--- a/absl/types/any_test.cc
+++ b/absl/types/any_test.cc
@@ -16,7 +16,6 @@
 
 #include <initializer_list>
 #include <type_traits>
-#include <typeinfo>
 #include <utility>
 #include <vector>
 
diff --git a/absl/types/optional.h b/absl/types/optional.h
index 3e010bd5d0cf..8b56513fab2e 100644
--- a/absl/types/optional.h
+++ b/absl/types/optional.h
@@ -17,7 +17,7 @@
 // optional.h
 // -----------------------------------------------------------------------------
 //
-// This header file define the `absl::optional` type for holding a value which
+// This header file defines the `absl::optional` type for holding a value which
 // may or may not be present. This type is useful for providing value semantics
 // for operations that may either wish to return or hold "something-or-nothing".
 //
@@ -246,7 +246,7 @@ class optional_data_base : public optional_data_dtor_base<T> {
   }
 };
 
-// TODO(b/34201852): Add another base class using
+// TODO(absl-team) Add another class using
 // std::is_trivially_move_constructible trait when available to match
 // http://cplusplus.github.io/LWG/lwg-defects.html#2900, for types that
 // have trivial move but nontrivial copy.
@@ -502,7 +502,8 @@ class optional : private optional_internal::optional_data<T>,
   // the arguments `std::forward<Args>(args)...`  within the `optional`.
   // (The `in_place_t` is a tag used to indicate that the contained object
   // should be constructed in-place.)
-  // TODO(b/34201852): Add std::is_constructible<T, Args&&...> SFINAE.
+  //
+  // TODO(absl-team): Add std::is_constructible<T, Args&&...> SFINAE.
   template <typename... Args>
   constexpr explicit optional(in_place_t, Args&&... args)
       : data_base(in_place_t(), absl::forward<Args>(args)...) {}
diff --git a/absl/types/optional_test.cc b/absl/types/optional_test.cc
index 65f43871e1c0..645f5b93cf89 100644
--- a/absl/types/optional_test.cc
+++ b/absl/types/optional_test.cc
@@ -328,7 +328,7 @@ TEST(optionalTest, InPlaceConstructor) {
   static_assert(opt2->x == ConstexprType::kCtorInitializerList, "");
 #endif
 
-  // TODO(b/34201852): uncomment these when std::is_constructible<T, Args&&...>
+  // TODO(absl-team): uncomment these when std::is_constructible<T, Args&&...>
   // SFINAE is added to optional::optional(absl::in_place_t, Args&&...).
   // struct I {
   //   I(absl::in_place_t);
diff --git a/absl/types/span_test.cc b/absl/types/span_test.cc
index 22ea33e0a278..5a4f0014af38 100644
--- a/absl/types/span_test.cc
+++ b/absl/types/span_test.cc
@@ -14,7 +14,6 @@
 
 #include "absl/types/span.h"
 
-#include <algorithm>
 #include <array>
 #include <initializer_list>
 #include <numeric>
@@ -25,10 +24,9 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "absl/base/attributes.h"
 #include "absl/base/config.h"
 #include "absl/base/internal/exception_testing.h"
-#include "absl/base/macros.h"
-#include "absl/base/port.h"
 #include "absl/container/fixed_array.h"
 #include "absl/container/inlined_vector.h"
 #include "absl/strings/str_cat.h"