diff --git a/tsl/platform/BUILD b/tsl/platform/BUILD
index 2d6a85bbb..51f832ae7 100644
--- a/tsl/platform/BUILD
+++ b/tsl/platform/BUILD
@@ -180,6 +180,7 @@ cc_library(
         ":strcat",
         ":stringpiece",
         "@com_google_absl//absl/algorithm:container",
+        "@com_google_absl//absl/types:span",
         "@xla//xla/tsl/platform:logging",
         "@xla//xla/tsl/platform:types",
     ],
@@ -196,6 +197,7 @@ cc_library(
     deps = [
         ":platform",
         ":tstring",
+        "@com_google_absl//absl/strings:cord",
         "@xla//xla/tsl/platform:types",
     ] + tsl_protobuf_deps(),
 )
@@ -1073,6 +1075,7 @@ tsl_cc_test(
     srcs = ["hash_test.cc"],
     deps = [
         ":hash",
+        "@com_google_absl//absl/strings:string_view",
         "@com_google_googletest//:gtest_main",
         "@xla//xla/tsl/platform:logging",
         "@xla//xla/tsl/platform:test",
@@ -1248,6 +1251,7 @@ tsl_cc_test(
     ],
     deps = [
         ":refcount",
+        "@com_google_absl//absl/log",
         "@com_google_googletest//:gtest_main",
         "@xla//xla/tsl/platform:env",
         "@xla//xla/tsl/platform:env_impl",
@@ -1319,6 +1323,7 @@ tsl_cc_test(
     deps = [
         ":mutex",
         ":platform_port",
+        "@com_google_absl//absl/log",
         "@com_google_googletest//:gtest_main",
         "@xla//xla/tsl/platform:env",
         "@xla//xla/tsl/platform:env_time",
@@ -1334,6 +1339,7 @@ tsl_cc_test(
     ],
     deps = [
         ":scanner",
+        "@com_google_absl//absl/strings:string_view",
         "@com_google_googletest//:gtest_main",
         "@xla//xla/tsl/platform:test",
     ],
@@ -1347,6 +1353,8 @@ tsl_cc_test(
     ],
     deps = [
         ":str_util",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/strings:string_view",
         "@com_google_googletest//:gtest_main",
         "@xla//xla/tsl/platform:test",
     ],
@@ -1404,6 +1412,8 @@ cc_library(
     copts = tsl_copts(),
     deps = [
         ":random",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
         "@xla//xla/tsl/platform:env",
         "@xla//xla/tsl/platform:errors",
@@ -1434,6 +1444,10 @@ tsl_cc_test(
     deps = [
         ":retrying_file_system",
         ":str_util",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/strings:string_view",
+        "@com_google_absl//absl/types:span",
         "@com_google_googletest//:gtest_main",
         "@xla//xla/tsl/lib/core:status_test_util",
         "@xla//xla/tsl/platform:env_impl",
@@ -1448,6 +1462,8 @@ tsl_cc_test(
     deps = [
         ":retrying_utils",
         ":str_util",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
         "@com_google_googletest//:gtest_main",
         "@xla//xla/tsl/lib/core:status_test_util",
diff --git a/tsl/platform/base64.cc b/tsl/platform/base64.cc
index 7c21d29c9..9a6af9273 100644
--- a/tsl/platform/base64.cc
+++ b/tsl/platform/base64.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tsl/platform/base64.h"
 
+#include <cstdint>
 #include <cstring>
 #include <memory>
 
diff --git a/tsl/platform/coding.cc b/tsl/platform/coding.cc
index d83312b1c..efb140e09 100644
--- a/tsl/platform/coding.cc
+++ b/tsl/platform/coding.cc
@@ -15,6 +15,9 @@ limitations under the License.
 
 #include "tsl/platform/coding.h"
 
+#include <cstdint>
+#include <cstring>
+
 #include "xla/tsl/platform/byte_order.h"
 #include "xla/tsl/platform/types.h"
 #include "tsl/platform/stringpiece.h"
diff --git a/tsl/platform/ctstring_test.cc b/tsl/platform/ctstring_test.cc
index 61f126a97..7b769f114 100644
--- a/tsl/platform/ctstring_test.cc
+++ b/tsl/platform/ctstring_test.cc
@@ -15,7 +15,9 @@ limitations under the License.
 
 #include "tsl/platform/ctstring.h"
 
-#include <memory>
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
 #include <string>
 
 #include "xla/tsl/platform/test.h"
diff --git a/tsl/platform/denormal_test.cc b/tsl/platform/denormal_test.cc
index 0b682c002..619fe8a1b 100644
--- a/tsl/platform/denormal_test.cc
+++ b/tsl/platform/denormal_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
 // Testing configuration of denormal state.
 #include "tsl/platform/denormal.h"
 
+#include <cstdint>
 #include <cstring>
 #include <limits>
 
diff --git a/tsl/platform/fingerprint_test.cc b/tsl/platform/fingerprint_test.cc
index b6b990364..bab9b5154 100644
--- a/tsl/platform/fingerprint_test.cc
+++ b/tsl/platform/fingerprint_test.cc
@@ -16,6 +16,7 @@ limitations under the License.
 #include "tsl/platform/fingerprint.h"
 
 #include <array>
+#include <cstdint>
 #include <unordered_set>
 
 #include "xla/tsl/platform/test.h"
diff --git a/tsl/platform/hash_test.cc b/tsl/platform/hash_test.cc
index 010ccde83..cd82a88d3 100644
--- a/tsl/platform/hash_test.cc
+++ b/tsl/platform/hash_test.cc
@@ -15,10 +15,13 @@ limitations under the License.
 
 #include "tsl/platform/hash.h"
 
-#include <map>
+#include <cstddef>
+#include <string>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
+#include "absl/strings/string_view.h"
 #include "xla/tsl/platform/logging.h"
 #include "xla/tsl/platform/test.h"
 #include "xla/tsl/platform/test_benchmark.h"
diff --git a/tsl/platform/integral_types_test.cc b/tsl/platform/integral_types_test.cc
index 80655dbee..389c2e3f4 100644
--- a/tsl/platform/integral_types_test.cc
+++ b/tsl/platform/integral_types_test.cc
@@ -13,6 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include <cstdint>
+
 #include "xla/tsl/platform/test.h"
 #include "xla/tsl/platform/types.h"
 
diff --git a/tsl/platform/numbers_test.cc b/tsl/platform/numbers_test.cc
index 1cd033e7b..b4629fe34 100644
--- a/tsl/platform/numbers_test.cc
+++ b/tsl/platform/numbers_test.cc
@@ -15,13 +15,16 @@ limitations under the License.
 
 #include "tsl/platform/numbers.h"
 
+#include <cfloat>
 #include <cmath>
 #include <cstdint>
 #include <cstdlib>
 #include <limits>
 #include <string>
 
+#include "absl/strings/numbers.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 #include "xla/tsl/platform/test.h"
 #include "xla/tsl/platform/types.h"
 
diff --git a/tsl/platform/path.h b/tsl/platform/path.h
index bf9537c0e..956f97514 100644
--- a/tsl/platform/path.h
+++ b/tsl/platform/path.h
@@ -18,6 +18,7 @@ limitations under the License.
 
 #include <string>
 
+#include "absl/types/span.h"
 #include "xla/tsl/platform/types.h"
 #include "tsl/platform/stringpiece.h"
 
diff --git a/tsl/platform/port_test.cc b/tsl/platform/port_test.cc
index d238fec66..1e41d2a24 100644
--- a/tsl/platform/port_test.cc
+++ b/tsl/platform/port_test.cc
@@ -13,8 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include <condition_variable>
+#include <cstddef>
+#include <cstdint>
+#include <ctime>
 
+#include "absl/log/log.h"
 #include "xla/tsl/platform/env_time.h"
 #include "xla/tsl/platform/test.h"
 #include "xla/tsl/platform/threadpool.h"
diff --git a/tsl/platform/protobuf.cc b/tsl/platform/protobuf.cc
index 6a3311004..76c016d4a 100644
--- a/tsl/platform/protobuf.cc
+++ b/tsl/platform/protobuf.cc
@@ -15,6 +15,11 @@ limitations under the License.
 
 #include "tsl/platform/protobuf.h"
 
+#include <algorithm>
+#include <cstddef>
+#include <cstdint>
+#include <limits>
+
 namespace tsl {
 
 const char* kProtobufInt64Typename = "::tensorflow::protobuf_int64";
diff --git a/tsl/platform/protobuf.h b/tsl/platform/protobuf.h
index c2f8bee91..0266a5a85 100644
--- a/tsl/platform/protobuf.h
+++ b/tsl/platform/protobuf.h
@@ -21,6 +21,7 @@ limitations under the License.
 #include <string>
 #include <utility>
 
+#include "absl/strings/cord.h"
 #include "xla/tsl/platform/types.h"
 #include "tsl/platform/platform.h"
 
diff --git a/tsl/platform/protobuf_util.cc b/tsl/platform/protobuf_util.cc
index 0bab61313..5f7a16c66 100644
--- a/tsl/platform/protobuf_util.cc
+++ b/tsl/platform/protobuf_util.cc
@@ -13,8 +13,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include <cstddef>
 #include <string>
 
+#include "third_party/protobuf/message.h"
+#include "third_party/protobuf/message_lite.h"
+#include "third_party/protobuf/text_format.h"
 #include "tsl/platform/protobuf.h"
 
 namespace tsl {
diff --git a/tsl/platform/refcount_test.cc b/tsl/platform/refcount_test.cc
index 0cf6dc496..cd6ef633b 100644
--- a/tsl/platform/refcount_test.cc
+++ b/tsl/platform/refcount_test.cc
@@ -15,6 +15,10 @@ limitations under the License.
 
 #include "tsl/platform/refcount.h"
 
+#include <atomic>
+#include <utility>
+
+#include "absl/log/log.h"
 #include "xla/tsl/platform/env.h"
 #include "xla/tsl/platform/test.h"
 #include "xla/tsl/platform/threadpool.h"
diff --git a/tsl/platform/retrying_file_system_test.cc b/tsl/platform/retrying_file_system_test.cc
index d60a34445..c6a831f93 100644
--- a/tsl/platform/retrying_file_system_test.cc
+++ b/tsl/platform/retrying_file_system_test.cc
@@ -15,8 +15,18 @@ limitations under the License.
 
 #include "tsl/platform/retrying_file_system.h"
 
-#include <fstream>
-
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <tuple>
+#include <utility>
+#include <vector>
+
+#include "absl/status/status.h"
+#include "absl/strings/match.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/span.h"
 #include "xla/tsl/lib/core/status_test_util.h"
 #include "xla/tsl/platform/test.h"
 #include "tsl/platform/str_util.h"
diff --git a/tsl/platform/retrying_utils.cc b/tsl/platform/retrying_utils.cc
index aaa1b98ee..a9a883889 100644
--- a/tsl/platform/retrying_utils.cc
+++ b/tsl/platform/retrying_utils.cc
@@ -17,8 +17,11 @@ limitations under the License.
 #include <algorithm>
 #include <cmath>
 #include <cstdint>
+#include <functional>
 #include <limits>
 
+#include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
 #include "absl/time/time.h"
 #include "xla/tsl/platform/env.h"
 #include "xla/tsl/platform/errors.h"
diff --git a/tsl/platform/retrying_utils.h b/tsl/platform/retrying_utils.h
index 5b1e802c4..a8f9c64f3 100644
--- a/tsl/platform/retrying_utils.h
+++ b/tsl/platform/retrying_utils.h
@@ -17,6 +17,7 @@ limitations under the License.
 
 #include <functional>
 
+#include "absl/status/status.h"
 #include "absl/time/time.h"
 #include "xla/tsl/platform/status.h"
 
diff --git a/tsl/platform/retrying_utils_test.cc b/tsl/platform/retrying_utils_test.cc
index 8d75c67a2..9e2f47b35 100644
--- a/tsl/platform/retrying_utils_test.cc
+++ b/tsl/platform/retrying_utils_test.cc
@@ -15,8 +15,12 @@ limitations under the License.
 #include "tsl/platform/retrying_utils.h"
 
 #include <cmath>
-#include <fstream>
+#include <cstdint>
+#include <functional>
+#include <vector>
 
+#include "absl/status/status.h"
+#include "absl/strings/match.h"
 #include "absl/time/time.h"
 #include "xla/tsl/lib/core/status_test_util.h"
 #include "xla/tsl/platform/env.h"
diff --git a/tsl/platform/scanner.cc b/tsl/platform/scanner.cc
index fe208678d..ee6816078 100644
--- a/tsl/platform/scanner.cc
+++ b/tsl/platform/scanner.cc
@@ -15,6 +15,8 @@ limitations under the License.
 
 #include "tsl/platform/scanner.h"
 
+#include "absl/strings/string_view.h"
+
 namespace tsl {
 namespace strings {
 
diff --git a/tsl/platform/scanner.h b/tsl/platform/scanner.h
index a13bcaf2b..bcab33495 100644
--- a/tsl/platform/scanner.h
+++ b/tsl/platform/scanner.h
@@ -19,6 +19,7 @@ limitations under the License.
 #include <string>
 
 #include "absl/strings/ascii.h"
+#include "absl/strings/strip.h"
 #include "xla/tsl/platform/macros.h"
 #include "tsl/platform/str_util.h"
 #include "tsl/platform/stringpiece.h"
diff --git a/tsl/platform/scanner_test.cc b/tsl/platform/scanner_test.cc
index dead6fb18..07dbc69bc 100644
--- a/tsl/platform/scanner_test.cc
+++ b/tsl/platform/scanner_test.cc
@@ -15,6 +15,7 @@ limitations under the License.
 
 #include "tsl/platform/scanner.h"
 
+#include "absl/strings/string_view.h"
 #include "xla/tsl/platform/test.h"
 
 namespace tsl {
diff --git a/tsl/platform/str_util_test.cc b/tsl/platform/str_util_test.cc
index 4a2e14dd1..ab82b4892 100644
--- a/tsl/platform/str_util_test.cc
+++ b/tsl/platform/str_util_test.cc
@@ -15,8 +15,14 @@ limitations under the License.
 
 #include "tsl/platform/str_util.h"
 
+#include <cstdint>
 #include <vector>
 
+#include "absl/strings/ascii.h"
+#include "absl/strings/escaping.h"
+#include "absl/strings/str_join.h"
+#include "absl/strings/string_view.h"
+#include "absl/strings/strip.h"
 #include "xla/tsl/platform/test.h"
 
 namespace tsl {
diff --git a/tsl/platform/stringpiece_test.cc b/tsl/platform/stringpiece_test.cc
index f50c1275e..e60391b8e 100644
--- a/tsl/platform/stringpiece_test.cc
+++ b/tsl/platform/stringpiece_test.cc
@@ -15,8 +15,6 @@ limitations under the License.
 
 #include "tsl/platform/stringpiece.h"
 
-#include <unordered_map>
-
 #include "xla/tsl/platform/test.h"
 
 namespace tsl {
diff --git a/tsl/platform/stringprintf_test.cc b/tsl/platform/stringprintf_test.cc
index 94cfd688f..d95d479d3 100644
--- a/tsl/platform/stringprintf_test.cc
+++ b/tsl/platform/stringprintf_test.cc
@@ -15,7 +15,9 @@ limitations under the License.
 
 #include "tsl/platform/stringprintf.h"
 
-#include <string>
+#include <cerrno>
+#include <clocale>
+#include <cstring>
 
 #include "xla/tsl/platform/test.h"
 
diff --git a/tsl/platform/tstring_test.cc b/tsl/platform/tstring_test.cc
index 04951c6e9..d79514171 100644
--- a/tsl/platform/tstring_test.cc
+++ b/tsl/platform/tstring_test.cc
@@ -15,8 +15,10 @@ limitations under the License.
 
 #include "tsl/platform/tstring.h"
 
-#include <memory>
+#include <cstddef>
+#include <sstream>
 #include <string>
+#include <utility>
 
 #include "absl/strings/str_cat.h"
 #include "xla/tsl/platform/test.h"
diff --git a/tsl/platform/unbounded_work_queue_test.cc b/tsl/platform/unbounded_work_queue_test.cc
index ce703010d..9b1bd76eb 100644
--- a/tsl/platform/unbounded_work_queue_test.cc
+++ b/tsl/platform/unbounded_work_queue_test.cc
@@ -15,6 +15,9 @@ limitations under the License.
 
 #include "tsl/platform/unbounded_work_queue.h"
 
+#include <functional>
+#include <memory>
+
 #include "absl/memory/memory.h"
 #include "xla/tsl/platform/env.h"
 #include "xla/tsl/platform/test.h"