diff --git a/tsl/platform/BUILD b/tsl/platform/BUILD
index 524e02a94..2e15f992e 100644
--- a/tsl/platform/BUILD
+++ b/tsl/platform/BUILD
@@ -203,6 +203,7 @@ cc_library(
     hdrs = ["protobuf.h"],
     deps = [
         ":platform",
+        ":tstring",
         "@xla//xla/tsl/platform:types",
     ] + tsl_protobuf_deps(),
 )
@@ -1330,7 +1331,7 @@ tsl_cc_test(
         ":platform_port",
         "@com_google_googletest//:gtest_main",
         "@xla//xla/tsl/platform:env",
-        "@xla//xla/tsl/platform:env_impl",
+        "@xla//xla/tsl/platform:env_time",
         "@xla//xla/tsl/platform:test",
     ],
 )
diff --git a/tsl/platform/protobuf.h b/tsl/platform/protobuf.h
index 301404b78..c2f8bee91 100644
--- a/tsl/platform/protobuf.h
+++ b/tsl/platform/protobuf.h
@@ -16,7 +16,10 @@ limitations under the License.
 #ifndef TENSORFLOW_TSL_PLATFORM_PROTOBUF_H_
 #define TENSORFLOW_TSL_PLATFORM_PROTOBUF_H_
 
+#include <cstddef>
 #include <cstdint>
+#include <string>
+#include <utility>
 
 #include "xla/tsl/platform/types.h"
 #include "tsl/platform/platform.h"
@@ -27,24 +30,25 @@ limitations under the License.
 // TensorFlow code should use the ::tensorflow::protobuf namespace to
 // refer to all protobuf APIs.
 
-#include "google/protobuf/descriptor.pb.h"         // IWYU pragma: export
-#include "google/protobuf/arena.h"                // IWYU pragma: export
-#include "google/protobuf/descriptor.h"           // IWYU pragma: export
-#include "google/protobuf/dynamic_message.h"      // IWYU pragma: export
-#include "google/protobuf/io/coded_stream.h"      // IWYU pragma: export
-#include "google/protobuf/io/tokenizer.h"         // IWYU pragma: export
-#include "google/protobuf/io/zero_copy_stream.h"  // IWYU pragma: export
-#include "google/protobuf/io/zero_copy_stream_impl_lite.h"  // IWYU pragma: export
-#include "google/protobuf/map.h"                 // IWYU pragma: export
-#include "google/protobuf/message.h"             // IWYU pragma: export
-#include "google/protobuf/repeated_field.h"      // IWYU pragma: export
-#include "google/protobuf/repeated_ptr_field.h"  // IWYU pragma: export
-#include "google/protobuf/text_format.h"         // IWYU pragma: export
-#include "google/protobuf/util/delimited_message_util.h"  // IWYU pragma: export
-#include "google/protobuf/util/field_comparator.h"  // IWYU pragma: export
-#include "google/protobuf/util/json_util.h"         // IWYU pragma: export
-#include "google/protobuf/util/message_differencer.h"  // IWYU pragma: export
-#include "google/protobuf/util/type_resolver_util.h"  // IWYU pragma: export
+#include "google/protobuf/descriptor.pb.h"         // IWYU pragma: keep
+#include "google/protobuf/arena.h"                // IWYU pragma: keep
+#include "google/protobuf/descriptor.h"           // IWYU pragma: keep
+#include "google/protobuf/dynamic_message.h"      // IWYU pragma: keep
+#include "google/protobuf/io/coded_stream.h"      // IWYU pragma: keep
+#include "google/protobuf/io/tokenizer.h"         // IWYU pragma: keep
+#include "google/protobuf/io/zero_copy_stream.h"  // IWYU pragma: keep
+#include "google/protobuf/io/zero_copy_stream_impl_lite.h"  // IWYU pragma: keep
+#include "google/protobuf/map.h"                 // IWYU pragma: keep
+#include "google/protobuf/message.h"             // IWYU pragma: keep
+#include "google/protobuf/repeated_field.h"      // IWYU pragma: keep
+#include "google/protobuf/repeated_ptr_field.h"  // IWYU pragma: keep
+#include "google/protobuf/text_format.h"         // IWYU pragma: keep
+#include "google/protobuf/util/delimited_message_util.h"  // IWYU pragma: keep
+#include "google/protobuf/util/field_comparator.h"     // IWYU pragma: keep
+#include "google/protobuf/util/json_util.h"            // IWYU pragma: keep
+#include "google/protobuf/util/message_differencer.h"  // IWYU pragma: keep
+#include "google/protobuf/util/type_resolver_util.h"   // IWYU pragma: keep
+#include "tsl/platform/tstring.h"
 
 #if !TSL_IS_IN_OSS
 #define TENSORFLOW_PROTOBUF_USES_CORD 1