diff --git a/tsl/platform/BUILD b/tsl/platform/BUILD
index 58f8c0f75..60e1a232a 100644
--- a/tsl/platform/BUILD
+++ b/tsl/platform/BUILD
@@ -40,13 +40,11 @@ cc_library(
     srcs = ["base64.cc"],
     hdrs = ["base64.h"],
     deps = [
-        ":stringpiece",
+        ":tstring",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/strings:string_view",
         "@xla//xla/tsl/platform:errors",
         "@xla//xla/tsl/platform:macros",
-        "@xla//xla/tsl/platform:status",
-        "@xla//xla/tsl/platform:types",
     ],
 )
 
diff --git a/tsl/platform/base64.cc b/tsl/platform/base64.cc
index fb4887bec..7a71a3c63 100644
--- a/tsl/platform/base64.cc
+++ b/tsl/platform/base64.cc
@@ -15,14 +15,14 @@ limitations under the License.
 
 #include "tsl/platform/base64.h"
 
+#include <cstdint>
 #include <cstring>
 #include <memory>
 
 #include "absl/status/status.h"
+#include "absl/strings/string_view.h"
 #include "xla/tsl/platform/errors.h"
 #include "xla/tsl/platform/macros.h"
-#include "xla/tsl/platform/types.h"
-#include "tsl/platform/stringpiece.h"
 
 namespace tsl {
 namespace {
@@ -201,16 +201,20 @@ absl::Status Base64Encode(absl::string_view source, bool with_padding,
   return absl::OkStatus();
 }
 
-template Status Base64Decode<std::string>(StringPiece data,
-                                          std::string* decoded);
-template Status Base64Encode<std::string>(StringPiece source,
-                                          std::string* encoded);
-template Status Base64Encode<std::string>(StringPiece source, bool with_padding,
-                                          std::string* encoded);
-
-template Status Base64Decode<tstring>(StringPiece data, tstring* decoded);
-template Status Base64Encode<tstring>(StringPiece source, tstring* encoded);
-template Status Base64Encode<tstring>(StringPiece source, bool with_padding,
-                                      tstring* encoded);
+template absl::Status Base64Decode<std::string>(absl::string_view data,
+                                                std::string* decoded);
+template absl::Status Base64Encode<std::string>(absl::string_view source,
+                                                std::string* encoded);
+template absl::Status Base64Encode<std::string>(absl::string_view source,
+                                                bool with_padding,
+                                                std::string* encoded);
+
+template absl::Status Base64Decode<tstring>(absl::string_view data,
+                                            tstring* decoded);
+template absl::Status Base64Encode<tstring>(absl::string_view source,
+                                            tstring* encoded);
+template absl::Status Base64Encode<tstring>(absl::string_view source,
+                                            bool with_padding,
+                                            tstring* encoded);
 
 }  // namespace tsl
diff --git a/tsl/platform/base64.h b/tsl/platform/base64.h
index e02f77aa9..efda2b2cf 100644
--- a/tsl/platform/base64.h
+++ b/tsl/platform/base64.h
@@ -20,8 +20,7 @@ limitations under the License.
 
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
-#include "xla/tsl/platform/status.h"
-#include "tsl/platform/stringpiece.h"
+#include "tsl/platform/tstring.h"
 
 namespace tsl {
 
@@ -42,21 +41,21 @@ template <typename T>
 absl::Status Base64Decode(absl::string_view data, T* decoded);
 
 // Explicit instantiations defined in base64.cc.
-extern template Status Base64Decode<std::string>(StringPiece data,
-                                                 std::string* decoded);
-extern template Status Base64Encode<std::string>(StringPiece source,
-                                                 std::string* encoded);
-extern template Status Base64Encode<std::string>(StringPiece source,
-                                                 bool with_padding,
-                                                 std::string* encoded);
-
-extern template Status Base64Decode<tstring>(StringPiece data,
-                                             tstring* decoded);
-extern template Status Base64Encode<tstring>(StringPiece source,
-                                             tstring* encoded);
-extern template Status Base64Encode<tstring>(StringPiece source,
-                                             bool with_padding,
-                                             tstring* encoded);
+extern template absl::Status Base64Decode<std::string>(absl::string_view data,
+                                                       std::string* decoded);
+extern template absl::Status Base64Encode<std::string>(absl::string_view source,
+                                                       std::string* encoded);
+extern template absl::Status Base64Encode<std::string>(absl::string_view source,
+                                                       bool with_padding,
+                                                       std::string* encoded);
+
+extern template absl::Status Base64Decode<tstring>(absl::string_view data,
+                                                   tstring* decoded);
+extern template absl::Status Base64Encode<tstring>(absl::string_view source,
+                                                   tstring* encoded);
+extern template absl::Status Base64Encode<tstring>(absl::string_view source,
+                                                   bool with_padding,
+                                                   tstring* encoded);
 
 }  // namespace tsl