diff --git a/xla/hlo/ir/BUILD b/xla/hlo/ir/BUILD
index e2d8d95951d6c..5caced5dfd817 100644
--- a/xla/hlo/ir/BUILD
+++ b/xla/hlo/ir/BUILD
@@ -89,6 +89,11 @@ cc_library(
         "//xla/service:name_uniquer",
         "//xla/tsl/lib/gtl:iterator_range",
         "//xla/tsl/lib/gtl:map_util",
+        "//xla/tsl/platform:env",
+        "//xla/tsl/platform:errors",
+        "//xla/tsl/platform:logging",
+        "//xla/tsl/platform:status",
+        "//xla/tsl/platform:statusor",
         "@com_google_absl//absl/algorithm:container",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:btree",
@@ -107,13 +112,8 @@ cc_library(
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/synchronization",
         "@com_google_absl//absl/types:span",
-        "@tsl//tsl/platform:env",
-        "@tsl//tsl/platform:errors",
         "@tsl//tsl/platform:fingerprint",
-        "@tsl//tsl/platform:logging",
         "@tsl//tsl/platform:protobuf",
-        "@tsl//tsl/platform:status",
-        "@tsl//tsl/platform:statusor",
     ],
 )
 
@@ -131,6 +131,8 @@ cc_library(
         "//xla:status_macros",
         "//xla:util",
         "//xla:xla_data_proto_cc",
+        "//xla/tsl/platform:errors",
+        "//xla/tsl/platform:statusor",
         "@com_google_absl//absl/algorithm:container",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:flat_hash_set",
@@ -139,9 +141,7 @@ cc_library(
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:span",
-        "@tsl//tsl/platform:errors",
         "@tsl//tsl/platform:protobuf",
-        "@tsl//tsl/platform:statusor",
     ],
 )
 
@@ -164,13 +164,13 @@ xla_cc_test(
         "//xla:xla_data_proto_cc",
         "//xla/hlo/parser:hlo_parser",
         "//xla/service:hlo_module_config",
+        "//xla/tsl/platform:status",
+        "//xla/tsl/platform:statusor",
+        "//xla/tsl/platform:test",
         "@com_google_absl//absl/hash",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/strings:string_view",
         "@com_google_googletest//:gtest_main",
-        "@tsl//tsl/platform:status",
-        "@tsl//tsl/platform:statusor",
-        "@tsl//tsl/platform:test",
     ],
 )
 
@@ -180,11 +180,11 @@ cc_library(
     hdrs = ["backend_config.h"],
     deps = [
         "//xla:util",
+        "//xla/tsl/platform:errors",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/synchronization",
-        "@tsl//tsl/platform:errors",
         "@tsl//tsl/platform:human_readable_json",
         "@tsl//tsl/platform:protobuf",
     ],
@@ -197,10 +197,11 @@ xla_cc_test(
         ":backend_config",
         "//xla/service/gpu:backend_configs_cc",
         "//xla/tsl/lib/core:status_test_util",
+        "//xla/tsl/platform:test",
+        "//xla/tsl/platform:test_main",
         "@com_google_absl//absl/strings:string_view",
         "@com_google_absl//absl/synchronization",
         "@com_google_googletest//:gtest_main",
-        "@tsl//tsl/platform:test",
     ],
 )
 
@@ -213,10 +214,10 @@ cc_library(
         "//xla:status_macros",
         "//xla/service:hlo_module_config",
         "//xla/service:hlo_proto_cc",
+        "//xla/tsl/platform:statusor",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
         "@com_google_absl//absl/types:span",
-        "@tsl//tsl/platform:statusor",
     ],
 )
 
@@ -240,8 +241,9 @@ xla_cc_test(
         ":hlo_instruction_utils",
         "//xla/hlo/testlib:hlo_hardware_independent_test_base",
         "//xla/hlo/utils:hlo_query",
+        "//xla/tsl/platform:test",
+        "//xla/tsl/platform:test_main",
         "@com_google_googletest//:gtest_main",
-        "@tsl//tsl/platform:test",
     ],
 )
 
@@ -263,8 +265,8 @@ cc_library(
     name = "ptrvec",
     hdrs = ["ptrvec.h"],
     deps = [
+        "//xla/tsl/platform:logging",
         "@com_google_absl//absl/log:check",
-        "@tsl//tsl/platform:logging",
     ],
 )
 
@@ -273,12 +275,13 @@ cc_test(
     srcs = ["ptrvec_test.cc"],
     deps = [
         ":ptrvec",
+        "//xla/tsl/platform:logging",
+        "//xla/tsl/platform:test",
+        "//xla/tsl/platform:test_benchmark",
+        "//xla/tsl/platform:test_main",
         "@com_google_absl//absl/strings:str_format",
         "@com_google_absl//absl/types:span",
         "@com_google_googletest//:gtest_main",
-        "@tsl//tsl/platform:logging",
-        "@tsl//tsl/platform:test",
-        "@tsl//tsl/platform:test_benchmark",
     ],
 )
 
@@ -306,6 +309,7 @@ xla_cc_test(
         ":hlo",
         "//xla:xla_data_proto_cc",
         "//xla/service:hlo_proto_cc",
+        "//xla/tsl/platform:test_main",
         "@com_google_googletest//:gtest_main",
     ],
 )
diff --git a/xla/hlo/ir/backend_config.cc b/xla/hlo/ir/backend_config.cc
index 9f26ae04cddd0..ab2819f17f1f5 100644
--- a/xla/hlo/ir/backend_config.cc
+++ b/xla/hlo/ir/backend_config.cc
@@ -22,8 +22,8 @@ limitations under the License.
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/synchronization/mutex.h"
+#include "xla/tsl/platform/errors.h"
 #include "xla/util.h"
-#include "tsl/platform/errors.h"
 #include "tsl/platform/human_readable_json.h"
 #include "tsl/platform/protobuf.h"
 
diff --git a/xla/hlo/ir/backend_config_test.cc b/xla/hlo/ir/backend_config_test.cc
index 09b56347e450e..75faa55cb7e03 100644
--- a/xla/hlo/ir/backend_config_test.cc
+++ b/xla/hlo/ir/backend_config_test.cc
@@ -25,7 +25,7 @@ limitations under the License.
 #include "absl/synchronization/notification.h"
 #include "xla/service/gpu/backend_configs.pb.h"
 #include "xla/tsl/lib/core/status_test_util.h"
-#include "tsl/platform/test.h"
+#include "xla/tsl/platform/test.h"
 
 namespace xla {
 namespace {
diff --git a/xla/hlo/ir/collective_device_list.cc b/xla/hlo/ir/collective_device_list.cc
index edc1c24da106f..b52514380349f 100644
--- a/xla/hlo/ir/collective_device_list.cc
+++ b/xla/hlo/ir/collective_device_list.cc
@@ -27,8 +27,8 @@ limitations under the License.
 #include "absl/strings/str_join.h"
 #include "absl/types/span.h"
 #include "xla/service/hlo.pb.h"
+#include "xla/tsl/platform/logging.h"  // IWYU pragma: keep
 #include "xla/xla_data.pb.h"
-#include "tsl/platform/logging.h"  // IWYU pragma: keep
 #include "tsl/platform/protobuf.h"
 
 namespace xla {
diff --git a/xla/hlo/ir/dfs_hlo_visitor.cc b/xla/hlo/ir/dfs_hlo_visitor.cc
index d7afa4b1b9268..b6e694fd1a5f3 100644
--- a/xla/hlo/ir/dfs_hlo_visitor.cc
+++ b/xla/hlo/ir/dfs_hlo_visitor.cc
@@ -18,8 +18,8 @@ limitations under the License.
 #include "absl/status/status.h"
 #include "xla/hlo/ir/hlo_instruction.h"
 #include "xla/hlo/ir/hlo_opcode.h"
+#include "xla/tsl/platform/logging.h"
 #include "xla/util.h"
-#include "tsl/platform/logging.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/dfs_hlo_visitor.h b/xla/hlo/ir/dfs_hlo_visitor.h
index 15c039db8383a..37ca85f126a40 100644
--- a/xla/hlo/ir/dfs_hlo_visitor.h
+++ b/xla/hlo/ir/dfs_hlo_visitor.h
@@ -26,9 +26,9 @@ limitations under the License.
 #include "absl/types/span.h"
 #include "xla/hlo/ir/hlo_opcode.h"
 #include "xla/literal.h"
+#include "xla/tsl/platform/status.h"
 #include "xla/types.h"
 #include "xla/xla_data.pb.h"
-#include "tsl/platform/status.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/dfs_hlo_visitor_with_default.h b/xla/hlo/ir/dfs_hlo_visitor_with_default.h
index 2a0e3b1a18f7b..0e00093296f8b 100644
--- a/xla/hlo/ir/dfs_hlo_visitor_with_default.h
+++ b/xla/hlo/ir/dfs_hlo_visitor_with_default.h
@@ -27,7 +27,7 @@ limitations under the License.
 #include "xla/hlo/ir/hlo_computation.h"
 #include "xla/hlo/ir/hlo_instruction.h"
 #include "xla/hlo/ir/hlo_module.h"
-#include "tsl/platform/status.h"
+#include "xla/tsl/platform/status.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/dynamic_parameter_binding.cc b/xla/hlo/ir/dynamic_parameter_binding.cc
index 9a90dbda61f60..5da5638e77cdb 100644
--- a/xla/hlo/ir/dynamic_parameter_binding.cc
+++ b/xla/hlo/ir/dynamic_parameter_binding.cc
@@ -27,7 +27,7 @@ limitations under the License.
 #include "xla/hlo/ir/hlo_instruction.h"
 #include "xla/shape_util.h"
 #include "xla/status_macros.h"
-#include "tsl/platform/errors.h"
+#include "xla/tsl/platform/errors.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_casting_utils.h b/xla/hlo/ir/hlo_casting_utils.h
index ff635675bca9c..b28c8301d7ff2 100644
--- a/xla/hlo/ir/hlo_casting_utils.h
+++ b/xla/hlo/ir/hlo_casting_utils.h
@@ -21,7 +21,7 @@ limitations under the License.
 #include <type_traits>
 
 #include "xla/hlo/ir/hlo_instruction.h"
-#include "tsl/platform/logging.h"
+#include "xla/tsl/platform/logging.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_computation.cc b/xla/hlo/ir/hlo_computation.cc
index 0cb22c0964e57..2b287bc444bfc 100644
--- a/xla/hlo/ir/hlo_computation.cc
+++ b/xla/hlo/ir/hlo_computation.cc
@@ -62,12 +62,12 @@ limitations under the License.
 #include "xla/shape_util.h"
 #include "xla/status_macros.h"
 #include "xla/tsl/lib/gtl/iterator_range.h"
+#include "xla/tsl/platform/errors.h"
+#include "xla/tsl/platform/logging.h"
+#include "xla/tsl/platform/status.h"
+#include "xla/tsl/platform/statusor.h"
 #include "xla/util.h"
 #include "xla/xla_data.pb.h"
-#include "tsl/platform/errors.h"
-#include "tsl/platform/logging.h"
-#include "tsl/platform/status.h"
-#include "tsl/platform/statusor.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_computation.h b/xla/hlo/ir/hlo_computation.h
index 4411e3102b5a2..85b855ccb6680 100644
--- a/xla/hlo/ir/hlo_computation.h
+++ b/xla/hlo/ir/hlo_computation.h
@@ -51,9 +51,9 @@ limitations under the License.
 #include "xla/shape_util.h"
 #include "xla/status_macros.h"
 #include "xla/tsl/lib/gtl/iterator_range.h"
+#include "xla/tsl/platform/errors.h"
 #include "xla/util.h"
 #include "xla/xla_data.pb.h"
-#include "tsl/platform/errors.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_domain_metadata.h b/xla/hlo/ir/hlo_domain_metadata.h
index 249e406b18338..81e4c1f75ed99 100644
--- a/xla/hlo/ir/hlo_domain_metadata.h
+++ b/xla/hlo/ir/hlo_domain_metadata.h
@@ -23,8 +23,8 @@ limitations under the License.
 #include "absl/container/flat_hash_set.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
+#include "xla/tsl/platform/status.h"
 #include "xla/types.h"
-#include "tsl/platform/status.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_input_output_alias_config.cc b/xla/hlo/ir/hlo_input_output_alias_config.cc
index c31d7388b7b00..8de689e2008eb 100644
--- a/xla/hlo/ir/hlo_input_output_alias_config.cc
+++ b/xla/hlo/ir/hlo_input_output_alias_config.cc
@@ -36,9 +36,9 @@ limitations under the License.
 #include "xla/shape_tree.h"
 #include "xla/shape_util.h"
 #include "xla/status_macros.h"
+#include "xla/tsl/platform/errors.h"
+#include "xla/tsl/platform/logging.h"  // IWYU pragma: keep
 #include "xla/util.h"
-#include "tsl/platform/errors.h"
-#include "tsl/platform/logging.h"  // IWYU pragma: keep
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_instruction.cc b/xla/hlo/ir/hlo_instruction.cc
index 23a931baf8c45..e3b79efa9b30a 100644
--- a/xla/hlo/ir/hlo_instruction.cc
+++ b/xla/hlo/ir/hlo_instruction.cc
@@ -78,12 +78,12 @@ limitations under the License.
 #include "xla/status_macros.h"
 #include "xla/tsl/lib/gtl/iterator_range.h"
 #include "xla/tsl/lib/gtl/map_util.h"
+#include "xla/tsl/platform/errors.h"
+#include "xla/tsl/platform/logging.h"  // IWYU pragma: keep
+#include "xla/tsl/platform/status.h"
+#include "xla/tsl/platform/statusor.h"
 #include "xla/util.h"
 #include "xla/xla_data.pb.h"
-#include "tsl/platform/errors.h"
-#include "tsl/platform/logging.h"  // IWYU pragma: keep
-#include "tsl/platform/status.h"
-#include "tsl/platform/statusor.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_instruction.h b/xla/hlo/ir/hlo_instruction.h
index e30e8a7bef74f..f903aee766a38 100644
--- a/xla/hlo/ir/hlo_instruction.h
+++ b/xla/hlo/ir/hlo_instruction.h
@@ -66,9 +66,9 @@ limitations under the License.
 #include "xla/shape.h"
 #include "xla/shape_util.h"
 #include "xla/tsl/lib/gtl/iterator_range.h"
+#include "xla/tsl/platform/errors.h"
+#include "xla/tsl/platform/logging.h"  // IWYU pragma: keep
 #include "xla/xla_data.pb.h"
-#include "tsl/platform/errors.h"
-#include "tsl/platform/logging.h"  // IWYU pragma: keep
 #include "tsl/platform/protobuf.h"
 
 namespace xla {
diff --git a/xla/hlo/ir/hlo_instructions.cc b/xla/hlo/ir/hlo_instructions.cc
index c61298554bbe6..a9624eafbb6e8 100644
--- a/xla/hlo/ir/hlo_instructions.cc
+++ b/xla/hlo/ir/hlo_instructions.cc
@@ -60,13 +60,13 @@ limitations under the License.
 #include "xla/shape.h"
 #include "xla/shape_util.h"
 #include "xla/tsl/lib/gtl/iterator_range.h"
+#include "xla/tsl/platform/errors.h"
+#include "xla/tsl/platform/logging.h"  // IWYU pragma: keep
+#include "xla/tsl/platform/status.h"
 #include "xla/util.h"
 #include "xla/window_util.h"
 #include "xla/xla_data.pb.h"
-#include "tsl/platform/errors.h"
-#include "tsl/platform/logging.h"  // IWYU pragma: keep
 #include "tsl/platform/protobuf.h"
-#include "tsl/platform/status.h"
 
 namespace xla {
 namespace {
diff --git a/xla/hlo/ir/hlo_instructions.h b/xla/hlo/ir/hlo_instructions.h
index dd064b0389408..2dc884b5d1c39 100644
--- a/xla/hlo/ir/hlo_instructions.h
+++ b/xla/hlo/ir/hlo_instructions.h
@@ -48,9 +48,9 @@ limitations under the License.
 #include "xla/shape.h"
 #include "xla/shape_util.h"
 #include "xla/tsl/lib/gtl/iterator_range.h"
+#include "xla/tsl/platform/logging.h"  // IWYU pragma: keep
+#include "xla/tsl/platform/status.h"
 #include "xla/xla_data.pb.h"
-#include "tsl/platform/logging.h"  // IWYU pragma: keep
-#include "tsl/platform/status.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_module.cc b/xla/hlo/ir/hlo_module.cc
index 0ed24c019c6b7..dd93b519e91e5 100644
--- a/xla/hlo/ir/hlo_module.cc
+++ b/xla/hlo/ir/hlo_module.cc
@@ -57,14 +57,14 @@ limitations under the License.
 #include "xla/shape_util.h"
 #include "xla/status_macros.h"
 #include "xla/tsl/lib/gtl/map_util.h"
+#include "xla/tsl/platform/env.h"
+#include "xla/tsl/platform/errors.h"
+#include "xla/tsl/platform/logging.h"
+#include "xla/tsl/platform/status.h"
+#include "xla/tsl/platform/statusor.h"
 #include "xla/util.h"
 #include "xla/xla_data.pb.h"
-#include "tsl/platform/env.h"
-#include "tsl/platform/errors.h"
 #include "tsl/platform/fingerprint.h"
-#include "tsl/platform/logging.h"
-#include "tsl/platform/status.h"
-#include "tsl/platform/statusor.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_module.h b/xla/hlo/ir/hlo_module.h
index 141c5b65279cc..d6ce3d1843eba 100644
--- a/xla/hlo/ir/hlo_module.h
+++ b/xla/hlo/ir/hlo_module.h
@@ -53,7 +53,7 @@ limitations under the License.
 #include "xla/shape_util.h"
 #include "xla/status_macros.h"
 #include "xla/tsl/lib/gtl/iterator_range.h"
-#include "tsl/platform/logging.h"
+#include "xla/tsl/platform/logging.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_module_group.cc b/xla/hlo/ir/hlo_module_group.cc
index 6d57d496a4f74..fa0bc0b8a6ed4 100644
--- a/xla/hlo/ir/hlo_module_group.cc
+++ b/xla/hlo/ir/hlo_module_group.cc
@@ -29,7 +29,7 @@ limitations under the License.
 #include "xla/service/hlo.pb.h"
 #include "xla/service/hlo_module_config.h"
 #include "xla/status_macros.h"
-#include "tsl/platform/statusor.h"
+#include "xla/tsl/platform/statusor.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_module_metadata.cc b/xla/hlo/ir/hlo_module_metadata.cc
index eb15af83d4f51..8d9c43ae3251d 100644
--- a/xla/hlo/ir/hlo_module_metadata.cc
+++ b/xla/hlo/ir/hlo_module_metadata.cc
@@ -25,10 +25,10 @@ limitations under the License.
 #include "absl/status/status.h"
 #include "xla/service/hlo.pb.h"
 #include "xla/service/metrics.pb.h"
+#include "xla/tsl/platform/env.h"
+#include "xla/tsl/platform/statusor.h"
 #include "xla/util.h"
-#include "tsl/platform/env.h"
 #include "tsl/platform/protobuf.h"
-#include "tsl/platform/statusor.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_module_metadata.h b/xla/hlo/ir/hlo_module_metadata.h
index ef4c52e395ee1..eb58517b946bd 100644
--- a/xla/hlo/ir/hlo_module_metadata.h
+++ b/xla/hlo/ir/hlo_module_metadata.h
@@ -27,10 +27,10 @@ limitations under the License.
 #include "absl/status/statusor.h"
 #include "xla/service/hlo.pb.h"
 #include "xla/status_macros.h"
+#include "xla/tsl/platform/env.h"
+#include "xla/tsl/platform/statusor.h"
 #include "xla/util.h"
-#include "tsl/platform/env.h"
 #include "tsl/platform/protobuf.h"
-#include "tsl/platform/statusor.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_schedule.cc b/xla/hlo/ir/hlo_schedule.cc
index b0898a39ed777..9a8dd8307bd02 100644
--- a/xla/hlo/ir/hlo_schedule.cc
+++ b/xla/hlo/ir/hlo_schedule.cc
@@ -40,8 +40,8 @@ limitations under the License.
 #include "xla/service/hlo.pb.h"
 #include "xla/status_macros.h"
 #include "xla/tsl/lib/gtl/map_util.h"
+#include "xla/tsl/platform/errors.h"
 #include "xla/util.h"
-#include "tsl/platform/errors.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_sharding.cc b/xla/hlo/ir/hlo_sharding.cc
index a24fdb72f54c5..a9caed3b918b5 100644
--- a/xla/hlo/ir/hlo_sharding.cc
+++ b/xla/hlo/ir/hlo_sharding.cc
@@ -44,11 +44,11 @@ limitations under the License.
 #include "xla/shape_tree.h"
 #include "xla/shape_util.h"
 #include "xla/status_macros.h"
+#include "xla/tsl/platform/errors.h"
+#include "xla/tsl/platform/statusor.h"
 #include "xla/util.h"
 #include "xla/xla_data.pb.h"
-#include "tsl/platform/errors.h"
 #include "tsl/platform/protobuf.h"
-#include "tsl/platform/statusor.h"
 
 namespace xla {
 namespace {
diff --git a/xla/hlo/ir/hlo_sharding_metadata.cc b/xla/hlo/ir/hlo_sharding_metadata.cc
index 3be3eef29cc84..3245ab8543ac0 100644
--- a/xla/hlo/ir/hlo_sharding_metadata.cc
+++ b/xla/hlo/ir/hlo_sharding_metadata.cc
@@ -34,8 +34,8 @@ limitations under the License.
 #include "xla/shape_tree.h"
 #include "xla/shape_util.h"
 #include "xla/status_macros.h"
-#include "tsl/platform/errors.h"
-#include "tsl/platform/statusor.h"
+#include "xla/tsl/platform/errors.h"
+#include "xla/tsl/platform/statusor.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/hlo_sharding_metadata.h b/xla/hlo/ir/hlo_sharding_metadata.h
index 95069a5d6ac49..3c75c68375398 100644
--- a/xla/hlo/ir/hlo_sharding_metadata.h
+++ b/xla/hlo/ir/hlo_sharding_metadata.h
@@ -30,7 +30,7 @@ limitations under the License.
 #include "xla/hlo/ir/hlo_domain_metadata.h"
 #include "xla/hlo/ir/hlo_instruction.h"
 #include "xla/hlo/ir/hlo_sharding.h"
-#include "tsl/platform/status.h"
+#include "xla/tsl/platform/status.h"
 
 namespace xla {
 
diff --git a/xla/hlo/ir/ptrvec.h b/xla/hlo/ir/ptrvec.h
index 6dd30fc1ec317..1774e942b35dd 100644
--- a/xla/hlo/ir/ptrvec.h
+++ b/xla/hlo/ir/ptrvec.h
@@ -23,7 +23,7 @@
 #include <vector>
 
 #include "absl/log/check.h"
-#include "tsl/platform/logging.h"  // IWYU pragma: keep
+#include "xla/tsl/platform/logging.h"  // IWYU pragma: keep
 
 namespace xla {
 
diff --git a/xla/hlo/ir/ptrvec_test.cc b/xla/hlo/ir/ptrvec_test.cc
index 0834d38bcfcff..65bba7698bd4c 100644
--- a/xla/hlo/ir/ptrvec_test.cc
+++ b/xla/hlo/ir/ptrvec_test.cc
@@ -22,9 +22,9 @@ limitations under the License.
 
 #include "absl/strings/str_format.h"
 #include "absl/types/span.h"
-#include "tsl/platform/logging.h"
-#include "tsl/platform/test.h"
-#include "tsl/platform/test_benchmark.h"
+#include "xla/tsl/platform/logging.h"
+#include "xla/tsl/platform/test.h"
+#include "xla/tsl/platform/test_benchmark.h"
 
 namespace xla {
 namespace {